Skip to content

Commit

Permalink
NFS: Get rid of unnecessary asserts
Browse files Browse the repository at this point in the history
If the nfs_client fails to initialise correctly, then it will
return an error condition.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Nov 4, 2012
1 parent 168e4b3 commit 1fea73a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
6 changes: 1 addition & 5 deletions fs/nfs/client.c
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ void nfs_put_client(struct nfs_client *clp)
nfs_cb_idr_remove_locked(clp);
spin_unlock(&nn->nfs_client_lock);

BUG_ON(!list_empty(&clp->cl_superblocks));
WARN_ON_ONCE(!list_empty(&clp->cl_superblocks));

clp->rpc_ops->free_client(clp);
}
Expand Down Expand Up @@ -1061,10 +1061,6 @@ struct nfs_server *nfs_create_server(struct nfs_mount_info *mount_info,
if (error < 0)
goto error;

BUG_ON(!server->nfs_client);
BUG_ON(!server->nfs_client->rpc_ops);
BUG_ON(!server->nfs_client->rpc_ops->file_inode_ops);

/* Probe the root fh to retrieve its FSID */
error = nfs_probe_fsinfo(server, mount_info->mntfh, fattr);
if (error < 0)
Expand Down
4 changes: 0 additions & 4 deletions fs/nfs/nfs4client.c
Original file line number Diff line number Diff line change
Expand Up @@ -713,10 +713,6 @@ static int nfs4_server_common_setup(struct nfs_server *server,
struct nfs_fattr *fattr;
int error;

BUG_ON(!server->nfs_client);
BUG_ON(!server->nfs_client->rpc_ops);
BUG_ON(!server->nfs_client->rpc_ops->file_inode_ops);

/* data servers support only a subset of NFSv4.1 */
if (is_ds_only_client(server->nfs_client))
return -EPROTONOSUPPORT;
Expand Down

0 comments on commit 1fea73a

Please sign in to comment.