| Message ID | 20220831072111.3569680-2-yi.zhang@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | buffer: remove ll_rw_block() | expand |
On Wed 31-08-22 15:20:58, Zhang Yi wrote: > No one use __breadahead_gfp() and sb_breadahead_unmovable() any more, > remove them. > > Signed-off-by: Zhang Yi <yi.zhang@huawei.com> Looks good. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/buffer.c | 11 ----------- > include/linux/buffer_head.h | 8 -------- > 2 files changed, 19 deletions(-) > > diff --git a/fs/buffer.c b/fs/buffer.c > index 55e762a58eb6..a0b70b3239f3 100644 > --- a/fs/buffer.c > +++ b/fs/buffer.c > @@ -1348,17 +1348,6 @@ void __breadahead(struct block_device *bdev, sector_t block, unsigned size) > } > EXPORT_SYMBOL(__breadahead); > > -void __breadahead_gfp(struct block_device *bdev, sector_t block, unsigned size, > - gfp_t gfp) > -{ > - struct buffer_head *bh = __getblk_gfp(bdev, block, size, gfp); > - if (likely(bh)) { > - ll_rw_block(REQ_OP_READ | REQ_RAHEAD, 1, &bh); > - brelse(bh); > - } > -} > -EXPORT_SYMBOL(__breadahead_gfp); > - > /** > * __bread_gfp() - reads a specified block and returns the bh > * @bdev: the block_device to read from > diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h > index 089c9ade4325..c3863c417b00 100644 > --- a/include/linux/buffer_head.h > +++ b/include/linux/buffer_head.h > @@ -214,8 +214,6 @@ struct buffer_head *__getblk_gfp(struct block_device *bdev, sector_t block, > void __brelse(struct buffer_head *); > void __bforget(struct buffer_head *); > void __breadahead(struct block_device *, sector_t block, unsigned int size); > -void __breadahead_gfp(struct block_device *, sector_t block, unsigned int size, > - gfp_t gfp); > struct buffer_head *__bread_gfp(struct block_device *, > sector_t block, unsigned size, gfp_t gfp); > void invalidate_bh_lrus(void); > @@ -340,12 +338,6 @@ sb_breadahead(struct super_block *sb, sector_t block) > __breadahead(sb->s_bdev, block, sb->s_blocksize); > } > > -static inline void > -sb_breadahead_unmovable(struct super_block *sb, sector_t block) > -{ > - __breadahead_gfp(sb->s_bdev, block, sb->s_blocksize, 0); > -} > - > static inline struct buffer_head * > sb_getblk(struct super_block *sb, sector_t block) > { > -- > 2.31.1 >
diff --git a/fs/buffer.c b/fs/buffer.c index 55e762a58eb6..a0b70b3239f3 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -1348,17 +1348,6 @@ void __breadahead(struct block_device *bdev, sector_t block, unsigned size) } EXPORT_SYMBOL(__breadahead); -void __breadahead_gfp(struct block_device *bdev, sector_t block, unsigned size, - gfp_t gfp) -{ - struct buffer_head *bh = __getblk_gfp(bdev, block, size, gfp); - if (likely(bh)) { - ll_rw_block(REQ_OP_READ | REQ_RAHEAD, 1, &bh); - brelse(bh); - } -} -EXPORT_SYMBOL(__breadahead_gfp); - /** * __bread_gfp() - reads a specified block and returns the bh * @bdev: the block_device to read from diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 089c9ade4325..c3863c417b00 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -214,8 +214,6 @@ struct buffer_head *__getblk_gfp(struct block_device *bdev, sector_t block, void __brelse(struct buffer_head *); void __bforget(struct buffer_head *); void __breadahead(struct block_device *, sector_t block, unsigned int size); -void __breadahead_gfp(struct block_device *, sector_t block, unsigned int size, - gfp_t gfp); struct buffer_head *__bread_gfp(struct block_device *, sector_t block, unsigned size, gfp_t gfp); void invalidate_bh_lrus(void); @@ -340,12 +338,6 @@ sb_breadahead(struct super_block *sb, sector_t block) __breadahead(sb->s_bdev, block, sb->s_blocksize); } -static inline void -sb_breadahead_unmovable(struct super_block *sb, sector_t block) -{ - __breadahead_gfp(sb->s_bdev, block, sb->s_blocksize, 0); -} - static inline struct buffer_head * sb_getblk(struct super_block *sb, sector_t block) {
No one use __breadahead_gfp() and sb_breadahead_unmovable() any more, remove them. Signed-off-by: Zhang Yi <yi.zhang@huawei.com> --- fs/buffer.c | 11 ----------- include/linux/buffer_head.h | 8 -------- 2 files changed, 19 deletions(-)