[PATCH 1/2][Xenial SRU] Revert "UBUNTU: SAUCE: (namespace) Bypass sget() capability check for nfs"

[Seth Forshee]

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

This reverts commit d15123a5a9e5c9fcb95909ea30699d46035e7734 in
order to replace it with the more generic upstream fix.

Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
---
 fs/nfs/super.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 8a57020..f126828 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -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;
-- 
2.7.4