summaryrefslogtreecommitdiff
path: root/fs/nfs
diff options
context:
space:
mode:
authorJesper Juhl <jj@chaosbits.net>2011-04-10 17:57:07 +0200
committerTrond Myklebust <Trond.Myklebust@netapp.com>2011-04-12 19:34:21 -0400
commit160bc1604f8a33202578846c9a63e2a61105a4b7 (patch)
tree55460a664616db57b89aaea7ff64bac69b7e4d97 /fs/nfs
parent6faf9a54156fb4d01d73344cc90cb52dda074433 (diff)
downloadlinux-3.10-160bc1604f8a33202578846c9a63e2a61105a4b7.tar.gz
linux-3.10-160bc1604f8a33202578846c9a63e2a61105a4b7.tar.bz2
linux-3.10-160bc1604f8a33202578846c9a63e2a61105a4b7.zip
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>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/super.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 2b8e9a5e366..685a8a7bd17 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -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);