| From: Eric Sandeen <sandeen@redhat.com> |
| Subject: dlmfs: convert to the new mount API |
| Date: Mon, 28 Oct 2024 09:41:14 -0500 |
| |
| Patch series "ocfs2, dlmfs: convert to the new mount API". |
| |
| |
| This patch (of 2): |
| |
| Convert dlmfs to the new mount API. |
| |
| Link: https://lkml.kernel.org/r/20241028144443.609151-1-sandeen@redhat.com |
| Link: https://lkml.kernel.org/r/20241028144443.609151-2-sandeen@redhat.com |
| Signed-off-by: Eric Sandeen <sandeen@redhat.com> |
| Reviewed-by: Goldwyn Rodrigues <rgoldwyn@suse.com> |
| Tested-by: Goldwyn Rodrigues <rgoldwyn@suse.com> |
| Acked-by: Joseph Qi <joseph.qi@linux.alibaba.com> |
| Tested-by: Joseph Qi <joseph.qi@linux.alibaba.com> |
| Cc: Mark Fasheh <mark@fasheh.com> |
| Cc: Joel Becker <jlbec@evilplan.org> |
| Cc: Junxiao Bi <junxiao.bi@oracle.com> |
| Cc: Changwei Ge <gechangwei@live.cn> |
| Cc: Jun Piao <piaojun@huawei.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| fs/ocfs2/dlmfs/dlmfs.c | 23 ++++++++++++++++------- |
| 1 file changed, 16 insertions(+), 7 deletions(-) |
| |
| --- a/fs/ocfs2/dlmfs/dlmfs.c~dlmfs-convert-to-the-new-mount-api |
| +++ a/fs/ocfs2/dlmfs/dlmfs.c |
| @@ -20,6 +20,7 @@ |
| |
| #include <linux/module.h> |
| #include <linux/fs.h> |
| +#include <linux/fs_context.h> |
| #include <linux/pagemap.h> |
| #include <linux/types.h> |
| #include <linux/slab.h> |
| @@ -506,9 +507,7 @@ bail: |
| return status; |
| } |
| |
| -static int dlmfs_fill_super(struct super_block * sb, |
| - void * data, |
| - int silent) |
| +static int dlmfs_fill_super(struct super_block *sb, struct fs_context *fc) |
| { |
| sb->s_maxbytes = MAX_LFS_FILESIZE; |
| sb->s_blocksize = PAGE_SIZE; |
| @@ -556,17 +555,27 @@ static const struct inode_operations dlm |
| .setattr = dlmfs_file_setattr, |
| }; |
| |
| -static struct dentry *dlmfs_mount(struct file_system_type *fs_type, |
| - int flags, const char *dev_name, void *data) |
| +static int dlmfs_get_tree(struct fs_context *fc) |
| { |
| - return mount_nodev(fs_type, flags, data, dlmfs_fill_super); |
| + return get_tree_nodev(fc, dlmfs_fill_super); |
| +} |
| + |
| +static const struct fs_context_operations dlmfs_context_ops = { |
| + .get_tree = dlmfs_get_tree, |
| +}; |
| + |
| +static int dlmfs_init_fs_context(struct fs_context *fc) |
| +{ |
| + fc->ops = &dlmfs_context_ops; |
| + |
| + return 0; |
| } |
| |
| static struct file_system_type dlmfs_fs_type = { |
| .owner = THIS_MODULE, |
| .name = "ocfs2_dlmfs", |
| - .mount = dlmfs_mount, |
| .kill_sb = kill_litter_super, |
| + .init_fs_context = dlmfs_init_fs_context, |
| }; |
| MODULE_ALIAS_FS("ocfs2_dlmfs"); |
| |
| _ |