diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-21 09:35:13 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-21 09:35:13 +1100 |
| commit | 2ce063ff14db4738427172251d8a40d47d0be1a5 (patch) | |
| tree | 88a5420f01019d1645f3375fd0597bbcb891368d /fs/ocfs2 | |
| parent | 1e1542977100486aea7c6279e3b509dbd96af0e7 (diff) | |
| parent | d708e87ca399a09f48316c14f3b56f6facaf75a2 (diff) | |
| download | linux-next-2ce063ff14db4738427172251d8a40d47d0be1a5.tar.gz | |
Merge remote-tracking branch 'vfs/for-next'
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/dlmfs/dlmfs.c | 5 | ||||
| -rw-r--r-- | fs/ocfs2/super.c | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c index 602c71f32740..642e471a6472 100644 --- a/fs/ocfs2/dlmfs/dlmfs.c +++ b/fs/ocfs2/dlmfs/dlmfs.c @@ -568,6 +568,7 @@ bail: static int dlmfs_fill_super(struct super_block * sb, void * data, + size_t data_size, int silent) { sb->s_maxbytes = MAX_LFS_FILESIZE; @@ -617,9 +618,9 @@ static const struct inode_operations dlmfs_file_inode_operations = { }; static struct dentry *dlmfs_mount(struct file_system_type *fs_type, - int flags, const char *dev_name, void *data) + int flags, const char *dev_name, void *data, size_t data_size) { - return mount_nodev(fs_type, flags, data, dlmfs_fill_super); + return mount_nodev(fs_type, flags, data, data_size, dlmfs_fill_super); } static struct file_system_type dlmfs_fs_type = { diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 3415e0b09398..62237837a098 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -107,7 +107,8 @@ static int ocfs2_check_set_options(struct super_block *sb, static int ocfs2_show_options(struct seq_file *s, struct dentry *root); static void ocfs2_put_super(struct super_block *sb); static int ocfs2_mount_volume(struct super_block *sb); -static int ocfs2_remount(struct super_block *sb, int *flags, char *data); +static int ocfs2_remount(struct super_block *sb, int *flags, + char *data, size_t data_size); static void ocfs2_dismount_volume(struct super_block *sb, int mnt_err); static int ocfs2_initialize_mem_caches(void); static void ocfs2_free_mem_caches(void); @@ -633,7 +634,8 @@ static unsigned long long ocfs2_max_file_offset(unsigned int bbits, return (((unsigned long long)bytes) << bitshift) - trim; } -static int ocfs2_remount(struct super_block *sb, int *flags, char *data) +static int ocfs2_remount(struct super_block *sb, int *flags, + char *data, size_t data_size) { int incompat_features; int ret = 0; @@ -999,7 +1001,8 @@ static void ocfs2_disable_quotas(struct ocfs2_super *osb) } } -static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) +static int ocfs2_fill_super(struct super_block *sb, void *data, size_t data_size, + int silent) { struct dentry *root; int status, sector_size; @@ -1236,9 +1239,10 @@ read_super_error: static struct dentry *ocfs2_mount(struct file_system_type *fs_type, int flags, const char *dev_name, - void *data) + void *data, size_t data_size) { - return mount_bdev(fs_type, flags, dev_name, data, ocfs2_fill_super); + return mount_bdev(fs_type, flags, dev_name, data, data_size, + ocfs2_fill_super); } static struct file_system_type ocfs2_fs_type = { |