[PATCH] NFS: Remove dead code from nfs_fs_mount()

From: Jesper Juhl
Date: Sun Apr 10 2011 - 11:56:50 EST

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:

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@xxxxxxxxxxxxx>
super.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 2b8e9a5..685a8a7 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);

Jesper Juhl <jj@xxxxxxxxxxxxx> http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/