Pull misc mount API conversions from Al Viro: "Conversions to new API for shmem and friends and for mount_mtd()-using filesystems. As for the rest of the mount API conversions in -next, some of them belong in the individual trees (e.g. binderfs one should definitely go through android folks, after getting redone on top of their changes). I'm going to drop those and send the rest (trivial ones + stuff ACKed by maintainers) in a separate series - by that point they are independent from each other. Some stuff has already migrated into individual trees (NFS conversion, for example, or FUSE stuff, etc.); those presumably will go through the regular merges from corresponding trees." * 'work.mount2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: vfs: Make fs_parse() handle fs_param_is_fd-type params better vfs: Convert ramfs, shmem, tmpfs, devtmpfs, rootfs to use the new mount API shmem_parse_one(): switch to use of fs_parse() shmem_parse_options(): take handling a single option into a helper shmem_parse_options(): don't bother with mpol in separate variable shmem_parse_options(): use a separate structure to keep the results make shmem_fill_super() static make ramfs_fill_super() static devtmpfs: don't mix {ramfs,shmem}_fill_super() with mount_single() vfs: Convert squashfs to use the new mount API mtd: Kill mount_mtd() vfs: Convert jffs2 to use the new mount API vfs: Convert cramfs to use the new mount API vfs: Convert romfs to use the new mount API vfs: Add a single-or-reconfig keying to vfs_get_super()
Showing the changes to include/linux (4 of 17 files). Show all
Unified · Split
| @@ -141,6 +141,7 @@ extern void put_fs_context(struct fs_context *fc); · 140 unmodified lines | |||
| 141 | */ | 141 | */ |
| 142 | enum vfs_get_super_keying { | 142 | enum vfs_get_super_keying { |
| 143 | vfs_get_single_super, /* Only one such superblock may exist */ | 143 | vfs_get_single_super, /* Only one such superblock may exist */ |
| 144 | vfs_get_single_reconf_super, /* As above, but reconfigure if it exists */ | ||
| 144 | vfs_get_keyed_super, /* Superblocks with different s_fs_info keys may exist */ | 145 | vfs_get_keyed_super, /* Superblocks with different s_fs_info keys may exist */ |
| 145 | vfs_get_independent_super, /* Multiple independent superblocks may exist */ | 146 | vfs_get_independent_super, /* Multiple independent superblocks may exist */ |
| 146 | }; | 147 | }; |
| @@ -155,6 +156,9 @@ extern int get_tree_nodev(struct fs_context *fc, · 8 unmodified lines | |||
| 155 | extern int get_tree_single(struct fs_context *fc, | 156 | extern int get_tree_single(struct fs_context *fc, |
| 156 | int (*fill_super)(struct super_block *sb, | 157 | int (*fill_super)(struct super_block *sb, |
| 157 | struct fs_context *fc)); | 158 | struct fs_context *fc)); |
| 159 | extern int get_tree_single_reconf(struct fs_context *fc, | ||
| 160 | int (*fill_super)(struct super_block *sb, | ||
| 161 | struct fs_context *fc)); | ||
| 158 | extern int get_tree_keyed(struct fs_context *fc, | 162 | extern int get_tree_keyed(struct fs_context *fc, |
| 159 | int (*fill_super)(struct super_block *sb, | 163 | int (*fill_super)(struct super_block *sb, |
| 160 | struct fs_context *fc), | 164 | struct fs_context *fc), |
| @@ -17,9 +17,6 @@ · 16 unmodified lines | |||
| 17 | extern int get_tree_mtd(struct fs_context *fc, | 17 | extern int get_tree_mtd(struct fs_context *fc, |
| 18 | int (*fill_super)(struct super_block *sb, | 18 | int (*fill_super)(struct super_block *sb, |
| 19 | struct fs_context *fc)); | 19 | struct fs_context *fc)); |
| 20 | extern struct dentry *mount_mtd(struct file_system_type *fs_type, int flags, | ||
| 21 | const char *dev_name, void *data, | ||
| 22 | int (*fill_super)(struct super_block *, void *, int)); | ||
| 23 | extern void kill_mtd_super(struct super_block *sb); | 20 | extern void kill_mtd_super(struct super_block *sb); |
| 24 | 21 | ||
| 25 | 22 | ||
| @@ -4,8 +4,7 @@ · 3 unmodified lines | |||
| 4 | 4 | ||
| 5 | struct inode *ramfs_get_inode(struct super_block *sb, const struct inode *dir, | 5 | struct inode *ramfs_get_inode(struct super_block *sb, const struct inode *dir, |
| 6 | umode_t mode, dev_t dev); | 6 | umode_t mode, dev_t dev); |
| 7 | extern struct dentry *ramfs_mount(struct file_system_type *fs_type, | 7 | extern int ramfs_init_fs_context(struct fs_context *fc); |
| 8 | int flags, const char *dev_name, void *data); | ||
| 9 | 8 | ||
| 10 | #ifdef CONFIG_MMU | 9 | #ifdef CONFIG_MMU |
| 11 | static inline int | 10 | static inline int |
| @@ -17,9 +16,8 @@ ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize) · 5 unmodified lines | |||
| 17 | extern int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize); | 16 | extern int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize); |
| 18 | #endif | 17 | #endif |
| 19 | 18 | ||
| 19 | extern const struct fs_parameter_description ramfs_fs_parameters; | ||
| 20 | extern const struct file_operations ramfs_file_operations; | 20 | extern const struct file_operations ramfs_file_operations; |
| 21 | extern const struct vm_operations_struct generic_file_vm_ops; | 21 | extern const struct vm_operations_struct generic_file_vm_ops; |
| 22 | 22 | ||
| 23 | int ramfs_fill_super(struct super_block *sb, void *data, int silent); | ||
| 24 | |||
| 25 | #endif | 23 | #endif |
| @@ -49,8 +49,9 @@ static inline struct shmem_inode_info *SHMEM_I(struct inode *inode) · 48 unmodified lines | |||
| 49 | /* | 49 | /* |
| 50 | * Functions in mm/shmem.c called directly from elsewhere: | 50 | * Functions in mm/shmem.c called directly from elsewhere: |
| 51 | */ | 51 | */ |
| 52 | extern const struct fs_parameter_description shmem_fs_parameters; | ||
| 52 | extern int shmem_init(void); | 53 | extern int shmem_init(void); |
| 53 | extern int shmem_fill_super(struct super_block *sb, void *data, int silent); | 54 | extern int shmem_init_fs_context(struct fs_context *fc); |
| 54 | extern struct file *shmem_file_setup(const char *name, | 55 | extern struct file *shmem_file_setup(const char *name, |
| 55 | loff_t size, unsigned long flags); | 56 | loff_t size, unsigned long flags); |
| 56 | extern struct file *shmem_kernel_file_setup(const char *name, loff_t size, | 57 | extern struct file *shmem_kernel_file_setup(const char *name, loff_t size, |