summaryrefslogtreecommitdiffstats
path: root/fs/nfs/client.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-10-15 11:24:57 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-11-04 14:43:38 -0500
commit1fea73a86527d7ec463af6ff04b0830e1425ff6c (patch)
treec3a9057e690ac1b3e783d70612037a30b8dc57f9 /fs/nfs/client.c
parent168e4b39d1afb79a7e3ea6c3bb246b4c82c6bdb9 (diff)
downloadlinux-1fea73a86527d7ec463af6ff04b0830e1425ff6c.tar.gz
linux-1fea73a86527d7ec463af6ff04b0830e1425ff6c.tar.bz2
linux-1fea73a86527d7ec463af6ff04b0830e1425ff6c.zip
NFS: Get rid of unnecessary asserts
If the nfs_client fails to initialise correctly, then it will return an error condition. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/client.c')
-rw-r--r--fs/nfs/client.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 8b39a42ac35e..c285e0a117e4 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -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);
}
@@ -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)