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>
This commit is contained in:
parent
168e4b39d1
commit
1fea73a865
|
@ -277,7 +277,7 @@ void nfs_put_client(struct nfs_client *clp)
|
||||||
nfs_cb_idr_remove_locked(clp);
|
nfs_cb_idr_remove_locked(clp);
|
||||||
spin_unlock(&nn->nfs_client_lock);
|
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);
|
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)
|
if (error < 0)
|
||||||
goto error;
|
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 */
|
/* Probe the root fh to retrieve its FSID */
|
||||||
error = nfs_probe_fsinfo(server, mount_info->mntfh, fattr);
|
error = nfs_probe_fsinfo(server, mount_info->mntfh, fattr);
|
||||||
if (error < 0)
|
if (error < 0)
|
||||||
|
|
|
@ -713,10 +713,6 @@ static int nfs4_server_common_setup(struct nfs_server *server,
|
||||||
struct nfs_fattr *fattr;
|
struct nfs_fattr *fattr;
|
||||||
int error;
|
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 */
|
/* data servers support only a subset of NFSv4.1 */
|
||||||
if (is_ds_only_client(server->nfs_client))
|
if (is_ds_only_client(server->nfs_client))
|
||||||
return -EPROTONOSUPPORT;
|
return -EPROTONOSUPPORT;
|
||||||
|
|
Loading…
Reference in New Issue