From 04b29ab71a02a2c2232d503c822464d11c53ea96 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Tue, 24 Jan 2012 16:35:00 +0000
Subject: [PATCH] --- yaml --- r: 294439 b: refs/heads/master c:
 c15c928f36a2710746c2b945067215f436f45544 h: refs/heads/master i:   294437:
 beb9dd58fded7120e996775f55f8bee085678da0   294435:
 bd0735cffc28f11a08c643256be52e444227224f   294431:
 411bf88447768c8e2cd63f3a1826fbe50b0b271d v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/super.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 080f189a1696..ab6c1b35463c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3b773e4fd80524ac27802fcf11cfd9ed1d5491f
+refs/heads/master: c15c928f36a2710746c2b945067215f436f45544
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index b79f2a11c29e..8e210b2c16d7 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/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);