diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-15 18:55:51 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-15 18:55:51 +0300 |
| commit | 19fd4a91ddeec20f9971a06f6328558c392ad66a (patch) | |
| tree | a13bce5a020e125fbc8444db5dba81d54561d7a6 /include | |
| parent | f8bf101b3b1171923a011a47923a93f4b22e6cb0 (diff) | |
| parent | beae836e9c61ee039e367a94b14f7fea08f0ad4c (diff) | |
| download | linux-19fd4a91ddeec20f9971a06f6328558c392ad66a.tar.xz | |
Merge tag 'ovl-fixes-6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs
Pull overlayfs fixes from Amir Goldstein:
- Various fixes for regressions due to conversion to new mount
api in v6.5
- Disable a new mount option syntax (append lowerdir) that was
added in v6.5 because we plan to add a different lowerdir
append syntax in v6.7
* tag 'ovl-fixes-6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs:
ovl: temporarily disable appending lowedirs
ovl: fix regression in showing lowerdir mount option
ovl: fix regression in parsing of mount options with escaped comma
fs: factor out vfs_parse_monolithic_sep() helper
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs_context.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/fs_context.h b/include/linux/fs_context.h index 96332db693d5..c13e99cbbf81 100644 --- a/include/linux/fs_context.h +++ b/include/linux/fs_context.h @@ -136,6 +136,8 @@ extern struct fs_context *vfs_dup_fs_context(struct fs_context *fc); extern int vfs_parse_fs_param(struct fs_context *fc, struct fs_parameter *param); extern int vfs_parse_fs_string(struct fs_context *fc, const char *key, const char *value, size_t v_size); +int vfs_parse_monolithic_sep(struct fs_context *fc, void *data, + char *(*sep)(char **)); extern int generic_parse_monolithic(struct fs_context *fc, void *data); extern int vfs_get_tree(struct fs_context *fc); extern void put_fs_context(struct fs_context *fc); |