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);