Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / fs / nfs / super.c

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 1943898..ba41561 100644 (file)
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2288,6 +2288,8 @@ static struct dentry *nfs_fs_mount(struct file_system_type *fs_type,
                /* initial superblock/root creation */
                nfs_fill_super(s, data);
                nfs_fscache_get_super_cookie(s, data->fscache_uniq, NULL);
+               if (!(server->flags & NFS_MOUNT_UNSHARED))
+                       s->s_iflags |= SB_I_MULTIROOT;
        }
 
        mntroot = nfs_get_root(s, mntfh, dev_name);