From: Jeff Layton <jlayton@redhat.com>
Date: Tue, 24 Jan 2012 16:35:00 +0000 (+0000)
Subject: nfs: remove unneeded NULL pointer check in nfs4_remote_mount
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c15c928f36a2710746c2b945067215f436f45544;p=deliverable%2Flinux.git

nfs: remove unneeded NULL pointer check in nfs4_remote_mount

"data" is never NULL here.

Reported-by: Eric Paris <eparis@redhat.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index b79f2a11c29e..8e210b2c16d7 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2667,8 +2667,7 @@ nfs4_remote_mount(struct file_system_type *fs_type, int flags,
 	if (!s->s_root) {
 		/* initial superblock/root creation */
 		nfs4_fill_super(s);
-		nfs_fscache_get_super_cookie(
-			s, data ? data->fscache_uniq : NULL, NULL);
+		nfs_fscache_get_super_cookie(s, data->fscache_uniq, NULL);
 	}
 
 	mntroot = nfs4_get_root(s, mntfh, dev_name);