fuse: unexport fuse_put_request

[linux.git] / fs / fs_context.c

diff --git a/fs/fs_context.c b/fs/fs_context.c
index 103643c68e3fdfa394bf7133b0803ce14e38786f..138b5b4d621d2e86527a2116a2688b07eb11d3cb 100644 (file)
--- a/fs/fs_context.c
+++ b/fs/fs_context.c
@@ -279,10 +279,8 @@ static struct fs_context *alloc_fs_context(struct file_system_type *fs_type,
                fc->user_ns = get_user_ns(reference->d_sb->s_user_ns);
                break;
        case FS_CONTEXT_FOR_RECONFIGURE:
-               /* We don't pin any namespaces as the superblock's
-                * subscriptions cannot be changed at this point.
-                */
                atomic_inc(&reference->d_sb->s_active);
+               fc->user_ns = get_user_ns(reference->d_sb->s_user_ns);
                fc->root = dget(reference);
                break;
        }
@@ -506,7 +504,6 @@ void put_fs_context(struct fs_context *fc)
        put_net(fc->net_ns);
        put_user_ns(fc->user_ns);
        put_cred(fc->cred);
-       kfree(fc->subtype);
        put_fc_log(fc);
        put_filesystem(fc->fs_type);
        kfree(fc->source);
@@ -573,17 +570,6 @@ static int legacy_parse_param(struct fs_context *fc, struct fs_parameter *param)
                return 0;
        }
 
-       if ((fc->fs_type->fs_flags & FS_HAS_SUBTYPE) &&
-           strcmp(param->key, "subtype") == 0) {
-               if (param->type != fs_value_is_string)
-                       return invalf(fc, "VFS: Legacy: Non-string subtype");
-               if (fc->subtype)
-                       return invalf(fc, "VFS: Legacy: Multiple subtype");
-               fc->subtype = param->string;
-               param->string = NULL;
-               return 0;
-       }
-
        if (ctx->param_type == LEGACY_FS_MONOLITHIC_PARAMS)
                return invalf(fc, "VFS: Legacy: Can't mix monolithic and individual options");
 
@@ -740,8 +726,6 @@ void vfs_clean_context(struct fs_context *fc)
        fc->s_fs_info = NULL;
        fc->sb_flags = 0;
        security_free_mnt_opts(&fc->security);
-       kfree(fc->subtype);
-       fc->subtype = NULL;
        kfree(fc->source);
        fc->source = NULL;