Commit e576e05a authored Aug 10, 2009 by Bartlomiej Zolnierkiewicz Committed by Trond Myklebust Aug 10, 2009

nfs: remove superfluous BUG_ON()s


Subject: [PATCH] nfs: remove superfluous BUG_ON()s

Remove duplicated BUG_ON()s from nfs[4]_create_server()
(we make the same checks earlier in both functions).

This takes care of the following entries from Dan's list:

fs/nfs/client.c +1078 nfs_create_server(47) warning: variable derefenced before check 'server->nfs_client'
fs/nfs/client.c +1079 nfs_create_server(48) warning: variable derefenced before check 'server->nfs_client->rpc_ops'
fs/nfs/client.c +1363 nfs4_create_server(43) warning: variable derefenced before check 'server->nfs_client'
fs/nfs/client.c +1364 nfs4_create_server(44) warning: variable derefenced before check 'server->nfs_

Reported-by: Dan Carpenter <error27@gmail.com>
Cc: corbet@lwn.net
Cc: eteo@redhat.com
Cc: Julia Lawall <julia@diku.dk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

parent 38c73044

fs/nfs/client.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -1077,10 +1077,6 @@ struct nfs_server nfs_create_server(const struct nfs_parsed_mount_data data,
		(unsigned long long) server->fsid.major,
		(unsigned long long) server->fsid.minor);

		BUG_ON(!server->nfs_client);
		BUG_ON(!server->nfs_client->rpc_ops);
		BUG_ON(!server->nfs_client->rpc_ops->file_inode_ops);

		spin_lock(&nfs_client_lock);
		list_add_tail(&server->client_link, &server->nfs_client->cl_superblocks);
		list_add_tail(&server->master_link, &nfs_volume_list);
		@@ -1362,10 +1358,6 @@ struct nfs_server nfs4_create_server(const struct nfs_parsed_mount_data data,
		if (server->namelen == 0 \|\| server->namelen > NFS4_MAXNAMLEN)
		server->namelen = NFS4_MAXNAMLEN;

		BUG_ON(!server->nfs_client);
		BUG_ON(!server->nfs_client->rpc_ops);
		BUG_ON(!server->nfs_client->rpc_ops->file_inode_ops);

		spin_lock(&nfs_client_lock);
		list_add_tail(&server->client_link, &server->nfs_client->cl_superblocks);
		list_add_tail(&server->master_link, &nfs_volume_list);

Admin message