diff --git a/fs/fs_context.c b/fs/fs_context.c
index bc5a5f5f1853a32c3c4dbbbd66ec07c892a5c474..a47ccd5a4a78081b5e41409549c53c45a5cb47cd 100644
--- a/fs/fs_context.c
+++ b/fs/fs_context.c
@@ -662,11 +662,6 @@ static int legacy_get_tree(struct fs_context *fc)
 	struct super_block *sb;
 	struct dentry *root;
 
-	if (!(fc->sb_flags & (SB_KERNMOUNT|SB_SUBMOUNT))) {
-		if (!mount_capable(fc))
-			return -EPERM;
-	}
-
 	root = fc->fs_type->mount(fc->fs_type, fc->sb_flags,
 				      fc->source, ctx->legacy_data);
 	if (IS_ERR(root))
diff --git a/fs/super.c b/fs/super.c
index d1e2f46bad7e9faeffd69483ee39fdbd81f47ab6..2c38541cd89f2f569df5b1bc34033a1e5dfbf7e9 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -514,12 +514,6 @@ struct super_block *sget_fc(struct fs_context *fc,
 	struct user_namespace *user_ns = fc->global ? &init_user_ns : fc->user_ns;
 	int err;
 
-	if (!(fc->sb_flags & SB_KERNMOUNT) &&
-	    fc->purpose != FS_CONTEXT_FOR_SUBMOUNT) {
-		if (!mount_capable(fc))
-			return ERR_PTR(-EPERM);
-	}
-
 retry:
 	spin_lock(&sb_lock);
 	if (test) {
@@ -1421,6 +1415,12 @@ int vfs_get_tree(struct fs_context *fc)
 	if (fc->root)
 		return -EBUSY;
 
+	if (!(fc->sb_flags & SB_KERNMOUNT) &&
+	    fc->purpose != FS_CONTEXT_FOR_SUBMOUNT) {
+		if (!mount_capable(fc))
+			return -EPERM;
+	}
+
 	/* Get the mountable root in fc->root, with a ref on the root and a ref
 	 * on the superblock.
 	 */