Commit be687e48 authored by Seth Forshee's avatar Seth Forshee Committed by Tim Gardner

Revert "UBUNTU: SAUCE: (namespace) Bypass sget() capability check for nfs"

BugLink: http://bugs.launchpad.net/bugs/1612135

This reverts commit d15123a5 in
order to replace it with the more generic upstream fix.
Signed-off-by: default avatarSeth Forshee <seth.forshee@canonical.com>
Acked-by: default avatarStefan Bader <stefan.bader@canonical.com>
Acked-by: default avatarColin King <colin.king@canonical.com>
Acked-by: default avatarBrad Figg <brad.figg@canonical.com>
Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>
parent 0aa7720d
......@@ -2559,8 +2559,7 @@ struct dentry *nfs_fs_mount_common(struct nfs_server *server,
sb_mntdata.mntflags |= MS_SYNCHRONOUS;
/* Get a superblock - note that we may end up sharing one that already exists */
s = sget_userns(nfs_mod->nfs_fs, compare_super, nfs_set_super, flags,
&init_user_ns, &sb_mntdata);
s = sget(nfs_mod->nfs_fs, compare_super, nfs_set_super, flags, &sb_mntdata);
if (IS_ERR(s)) {
mntroot = ERR_CAST(s);
goto out_err_nosb;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment