vfs: subtype handling moved to fuse
The unused vfs code can be removed. Don't pass empty subtype (same as if ->parse callback isn't called). The bits that are left involve determining whether it's permitted to split the filesystem type string passed in to mount(2). Consequently, this means that we cannot get rid of the FS_HAS_SUBTYPE flag unless we define that a type string with a dot in it always indicates a subtype specification. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
committed by
Miklos Szeredi
parent
c30da2e981
commit
c7eb686963
@@ -504,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);
|
||||
@@ -571,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");
|
||||
|
||||
@@ -738,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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user