Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge patch series "remove or unexport unused fs_conext infrastructure"
Christoph Hellwig <hch@lst.de> says:
Now that the fs_context conversion is finished, remove all the bits
that did not end up having users, or unexport them if the users are
always built in.
* patches from https://patch.msgid.link/20260219065014.3550402-1-hch@lst.de:
fs: unexport fs_context_for_reconfigure
fs: remove fsparam_path / fs_param_is_path
fs: remove fsparam_blob / fs_param_is_blob
fs: mark bool_names static
Link: https://patch.msgid.link/20260219065014.3550402-1-hch@lst.de
Signed-off-by: Christian Brauner <brauner@kernel.org>
+3
-29
-4
Documentation/filesystems/mount_api.rst
-4
Documentation/filesystems/mount_api.rst
···
647
647
fs_param_is_u64 64-bit unsigned int result->uint_64
648
648
fs_param_is_enum Enum value name result->uint_32
649
649
fs_param_is_string Arbitrary string param->string
650
-
fs_param_is_blob Binary blob param->blob
651
650
fs_param_is_blockdev Blockdev path * Needs lookup
652
-
fs_param_is_path Path * Needs lookup
653
651
fs_param_is_fd File descriptor result->int_32
654
652
fs_param_is_uid User ID (u32) result->uid
655
653
fs_param_is_gid Group ID (u32) result->gid
···
679
681
fsparam_u64() fs_param_is_u64
680
682
fsparam_enum() fs_param_is_enum
681
683
fsparam_string() fs_param_is_string
682
-
fsparam_blob() fs_param_is_blob
683
684
fsparam_bdev() fs_param_is_blockdev
684
-
fsparam_path() fs_param_is_path
685
685
fsparam_fd() fs_param_is_fd
686
686
fsparam_uid() fs_param_is_uid
687
687
fsparam_gid() fs_param_is_gid
-1
fs/fs_context.c
-1
fs/fs_context.c
+1
-18
fs/fs_parser.c
+1
-18
fs/fs_parser.c
···
13
13
#include <linux/namei.h>
14
14
#include "internal.h"
15
15
16
-
const struct constant_table bool_names[] = {
16
+
static const struct constant_table bool_names[] = {
17
17
{ "0", false },
18
18
{ "1", true },
19
19
{ "false", false },
···
22
22
{ "yes", true },
23
23
{ },
24
24
};
25
-
EXPORT_SYMBOL(bool_names);
26
25
27
26
static const struct constant_table *
28
27
__lookup_constant(const struct constant_table *tbl, const char *name)
···
277
278
}
278
279
EXPORT_SYMBOL(fs_param_is_string);
279
280
280
-
int fs_param_is_blob(struct p_log *log, const struct fs_parameter_spec *p,
281
-
struct fs_parameter *param, struct fs_parse_result *result)
282
-
{
283
-
if (param->type != fs_value_is_blob)
284
-
return fs_param_bad_value(log, param);
285
-
return 0;
286
-
}
287
-
EXPORT_SYMBOL(fs_param_is_blob);
288
-
289
281
int fs_param_is_fd(struct p_log *log, const struct fs_parameter_spec *p,
290
282
struct fs_parameter *param, struct fs_parse_result *result)
291
283
{
···
360
370
return 0;
361
371
}
362
372
EXPORT_SYMBOL(fs_param_is_blockdev);
363
-
364
-
int fs_param_is_path(struct p_log *log, const struct fs_parameter_spec *p,
365
-
struct fs_parameter *param, struct fs_parse_result *result)
366
-
{
367
-
return 0;
368
-
}
369
-
EXPORT_SYMBOL(fs_param_is_path);
370
373
371
374
#ifdef CONFIG_VALIDATE_FS_PARSER
372
375
/**
+2
-6
include/linux/fs_parser.h
+2
-6
include/linux/fs_parser.h
···
27
27
* The type of parameter expected.
28
28
*/
29
29
fs_param_type fs_param_is_bool, fs_param_is_u32, fs_param_is_s32, fs_param_is_u64,
30
-
fs_param_is_enum, fs_param_is_string, fs_param_is_blob, fs_param_is_blockdev,
31
-
fs_param_is_path, fs_param_is_fd, fs_param_is_uid, fs_param_is_gid,
30
+
fs_param_is_enum, fs_param_is_string, fs_param_is_blockdev,
31
+
fs_param_is_fd, fs_param_is_uid, fs_param_is_gid,
32
32
fs_param_is_file_or_string;
33
33
34
34
/*
···
84
84
85
85
extern int lookup_constant(const struct constant_table tbl[], const char *name, int not_found);
86
86
87
-
extern const struct constant_table bool_names[];
88
-
89
87
#ifdef CONFIG_VALIDATE_FS_PARSER
90
88
extern bool fs_validate_description(const char *name,
91
89
const struct fs_parameter_spec *desc);
···
125
127
#define fsparam_enum(NAME, OPT, array) __fsparam(fs_param_is_enum, NAME, OPT, 0, array)
126
128
#define fsparam_string(NAME, OPT) \
127
129
__fsparam(fs_param_is_string, NAME, OPT, 0, NULL)
128
-
#define fsparam_blob(NAME, OPT) __fsparam(fs_param_is_blob, NAME, OPT, 0, NULL)
129
130
#define fsparam_bdev(NAME, OPT) __fsparam(fs_param_is_blockdev, NAME, OPT, 0, NULL)
130
-
#define fsparam_path(NAME, OPT) __fsparam(fs_param_is_path, NAME, OPT, 0, NULL)
131
131
#define fsparam_fd(NAME, OPT) __fsparam(fs_param_is_fd, NAME, OPT, 0, NULL)
132
132
#define fsparam_file_or_string(NAME, OPT) \
133
133
__fsparam(fs_param_is_file_or_string, NAME, OPT, 0, NULL)