diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-15 17:24:57 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-11-04 20:43:38 +0100 |
| commit | 1fea73a86527d7ec463af6ff04b0830e1425ff6c (patch) | |
| tree | c3a9057e690ac1b3e783d70612037a30b8dc57f9 | |
| parent | SUNRPC: add WARN_ON_ONCE for potential deadlock (diff) | |
| download | linux-1fea73a86527d7ec463af6ff04b0830e1425ff6c.tar.xz 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>
| -rw-r--r-- | fs/nfs/client.c | 6 | ||||
| -rw-r--r-- | fs/nfs/nfs4client.c | 4 |
2 files changed, 1 insertions, 9 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) diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index 6bacfde1319a..72717e67b34e 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -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; |