Commit 1fea73a8 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Get rid of unnecessary asserts 



If the nfs_client fails to initialise correctly, then it will
return an error condition.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 168e4b39

fs/nfs/client.c

+1 −5
Original line number Diff line number Diff line
@@ -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)

fs/nfs/nfs4client.c

+0 −4
Original line number Diff line number Diff line
@@ -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;