diff options
| author | James Morris <james.morris@microsoft.com> | 2018-03-22 22:26:16 +0100 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-03-22 22:26:16 +0100 |
| commit | 5893ed18a26d1f56b97c0290b0cbbc2d49d6de28 (patch) | |
| tree | 97aa931519fca28a0a12fad7485347198f8267cc /fs/nfs/super.c | |
| parent | exec: Set file unwritable before LSM check (diff) | |
| parent | Linux 4.16-rc6 (diff) | |
| download | linux-5893ed18a26d1f56b97c0290b0cbbc2d49d6de28.tar.xz linux-5893ed18a26d1f56b97c0290b0cbbc2d49d6de28.zip | |
Merge tag 'v4.16-rc6' into next-general
Merge to Linux 4.16-rc6 at the request of Jarkko, for his TPM updates.
Diffstat (limited to 'fs/nfs/super.c')
| -rw-r--r-- | fs/nfs/super.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 29bacdc56f6a..5e470e233c83 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -2631,6 +2631,8 @@ struct dentry *nfs_fs_mount_common(struct nfs_server *server, /* initial superblock/root creation */ mount_info->fill_super(s, mount_info); nfs_get_cache_cookie(s, mount_info->parsed, mount_info->cloned); + if (!(server->flags & NFS_MOUNT_UNSHARED)) + s->s_iflags |= SB_I_MULTIROOT; } mntroot = nfs_get_root(s, mount_info->mntfh, dev_name); |