| Message ID | 20191227080523.31808-2-naoto.kobayashi4c@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | ext4: Prevent memory reclaim from re-entering the filesystem and deadlocking | expand |
On Fri 27-12-19 17:05:21, Naoto Kobayashi wrote: > Since we're not using ext4_kvzalloc(), delete this function. > > Signed-off-by: Naoto Kobayashi <naoto.kobayashi4c@gmail.com> Looks good to me. You can add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/ext4/ext4.h | 1 - > fs/ext4/super.c | 10 ---------- > 2 files changed, 11 deletions(-) > > diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h > index 61987c106511..b25089e3896d 100644 > --- a/fs/ext4/ext4.h > +++ b/fs/ext4/ext4.h > @@ -2678,7 +2678,6 @@ extern int ext4_seq_options_show(struct seq_file *seq, void *offset); > extern int ext4_calculate_overhead(struct super_block *sb); > extern void ext4_superblock_csum_set(struct super_block *sb); > extern void *ext4_kvmalloc(size_t size, gfp_t flags); > -extern void *ext4_kvzalloc(size_t size, gfp_t flags); > extern int ext4_alloc_flex_bg_array(struct super_block *sb, > ext4_group_t ngroup); > extern const char *ext4_decode_error(struct super_block *sb, int errno, > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > index b205112ca051..83a231dedcbf 100644 > --- a/fs/ext4/super.c > +++ b/fs/ext4/super.c > @@ -214,16 +214,6 @@ void *ext4_kvmalloc(size_t size, gfp_t flags) > return ret; > } > > -void *ext4_kvzalloc(size_t size, gfp_t flags) > -{ > - void *ret; > - > - ret = kzalloc(size, flags | __GFP_NOWARN); > - if (!ret) > - ret = __vmalloc(size, flags | __GFP_ZERO, PAGE_KERNEL); > - return ret; > -} > - > ext4_fsblk_t ext4_block_bitmap(struct super_block *sb, > struct ext4_group_desc *bg) > { > -- > 2.16.6 >
On Fri, Dec 27, 2019 at 05:05:21PM +0900, Naoto Kobayashi wrote: > Since we're not using ext4_kvzalloc(), delete this function. > > Signed-off-by: Naoto Kobayashi <naoto.kobayashi4c@gmail.com> Thanks, applied. - Ted
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 61987c106511..b25089e3896d 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2678,7 +2678,6 @@ extern int ext4_seq_options_show(struct seq_file *seq, void *offset); extern int ext4_calculate_overhead(struct super_block *sb); extern void ext4_superblock_csum_set(struct super_block *sb); extern void *ext4_kvmalloc(size_t size, gfp_t flags); -extern void *ext4_kvzalloc(size_t size, gfp_t flags); extern int ext4_alloc_flex_bg_array(struct super_block *sb, ext4_group_t ngroup); extern const char *ext4_decode_error(struct super_block *sb, int errno, diff --git a/fs/ext4/super.c b/fs/ext4/super.c index b205112ca051..83a231dedcbf 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -214,16 +214,6 @@ void *ext4_kvmalloc(size_t size, gfp_t flags) return ret; } -void *ext4_kvzalloc(size_t size, gfp_t flags) -{ - void *ret; - - ret = kzalloc(size, flags | __GFP_NOWARN); - if (!ret) - ret = __vmalloc(size, flags | __GFP_ZERO, PAGE_KERNEL); - return ret; -} - ext4_fsblk_t ext4_block_bitmap(struct super_block *sb, struct ext4_group_desc *bg) {
Since we're not using ext4_kvzalloc(), delete this function. Signed-off-by: Naoto Kobayashi <naoto.kobayashi4c@gmail.com> --- fs/ext4/ext4.h | 1 - fs/ext4/super.c | 10 ---------- 2 files changed, 11 deletions(-) -- 2.16.6