diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-29 09:46:41 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-29 09:46:41 +1100 |
| commit | d5cf3eb64781339d592139c2e7f1cd0cc4d8a1ed (patch) | |
| tree | 684cea59ef56f6675bcd39856a7e7e2eb1cf64c5 /mm | |
| parent | 2a7fc9e3fc5e8663edc545a6fb121ea6ac2bdf50 (diff) | |
| parent | d708e87ca399a09f48316c14f3b56f6facaf75a2 (diff) | |
| download | linux-next-d5cf3eb64781339d592139c2e7f1cd0cc4d8a1ed.tar.gz | |
Merge remote-tracking branch 'vfs/for-next'
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/shmem.c | 10 | ||||
| -rw-r--r-- | mm/zsmalloc.c | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index d44991ea5ed4..7a73c7b4f571 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3347,7 +3347,8 @@ error: } -static int shmem_remount_fs(struct super_block *sb, int *flags, char *data) +static int shmem_remount_fs(struct super_block *sb, int *flags, + char *data, size_t data_size) { struct shmem_sb_info *sbinfo = SHMEM_SB(sb); struct shmem_sb_info config = *sbinfo; @@ -3430,7 +3431,8 @@ static void shmem_put_super(struct super_block *sb) sb->s_fs_info = NULL; } -int shmem_fill_super(struct super_block *sb, void *data, int silent) +int shmem_fill_super(struct super_block *sb, void *data, size_t data_size, + int silent) { struct inode *inode; struct shmem_sb_info *sbinfo; @@ -3644,9 +3646,9 @@ static const struct vm_operations_struct shmem_vm_ops = { }; static struct dentry *shmem_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, shmem_fill_super); + return mount_nodev(fs_type, flags, data, data_size, shmem_fill_super); } static struct file_system_type shmem_fs_type = { diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 0787d33b80d8..fd4b3a96c004 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1815,7 +1815,8 @@ static void lock_zspage(struct zspage *zspage) } static struct dentry *zs_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) { static const struct dentry_operations ops = { .d_dname = simple_dname, |