Commit 160bc160 authored Apr 10, 2011 by Jesper Juhl Committed by Trond Myklebust Apr 12, 2011

NFS: Remove dead code from nfs_fs_mount()



In fs/nfs/super.c::nfs_fs_mount() we test for a NULL 'data':

...
 		if (data == NULL || mntfh == NULL)
 			goto out_free_fh;
...

and then further down in the function we test 'data' again:

...
 			nfs_fscache_get_super_cookie(
 				s, data ? data->fscache_uniq : NULL, NULL);
...

this second check is just dead code since there is no way 'data' could
possibly be NULL here.
We also rely on a non-NULL 'data' in more than one location between these
two tests, further proving the point that the second test is bogus.

This patch removes the dead code.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

parent 6faf9a54

fs/nfs/super.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -2235,8 +2235,7 @@ static struct dentry nfs_fs_mount(struct file_system_type fs_type,
		if (!s->s_root) {
		/* initial superblock/root creation */
		nfs_fill_super(s, data);
		nfs_fscache_get_super_cookie(
		s, data ? data->fscache_uniq : NULL, NULL);
		nfs_fscache_get_super_cookie(s, data->fscache_uniq, NULL);
		}

		mntroot = nfs_get_root(s, mntfh, dev_name);

Admin message