diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-15 11:24:57 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-11-04 14:43:38 -0500 |
commit | 1fea73a86527d7ec463af6ff04b0830e1425ff6c (patch) | |
tree | c3a9057e690ac1b3e783d70612037a30b8dc57f9 /fs/nfs/client.c | |
parent | 168e4b39d1afb79a7e3ea6c3bb246b4c82c6bdb9 (diff) |
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.c | 6 |
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) | |||
277 | nfs_cb_idr_remove_locked(clp); | 277 | nfs_cb_idr_remove_locked(clp); |
278 | spin_unlock(&nn->nfs_client_lock); | 278 | spin_unlock(&nn->nfs_client_lock); |
279 | 279 | ||
280 | BUG_ON(!list_empty(&clp->cl_superblocks)); | 280 | WARN_ON_ONCE(!list_empty(&clp->cl_superblocks)); |
281 | 281 | ||
282 | clp->rpc_ops->free_client(clp); | 282 | clp->rpc_ops->free_client(clp); |
283 | } | 283 | } |
@@ -1061,10 +1061,6 @@ struct nfs_server *nfs_create_server(struct nfs_mount_info *mount_info, | |||
1061 | if (error < 0) | 1061 | if (error < 0) |
1062 | goto error; | 1062 | goto error; |
1063 | 1063 | ||
1064 | BUG_ON(!server->nfs_client); | ||
1065 | BUG_ON(!server->nfs_client->rpc_ops); | ||
1066 | BUG_ON(!server->nfs_client->rpc_ops->file_inode_ops); | ||
1067 | |||
1068 | /* Probe the root fh to retrieve its FSID */ | 1064 | /* Probe the root fh to retrieve its FSID */ |
1069 | error = nfs_probe_fsinfo(server, mount_info->mntfh, fattr); | 1065 | error = nfs_probe_fsinfo(server, mount_info->mntfh, fattr); |
1070 | if (error < 0) | 1066 | if (error < 0) |