| Message ID | 20220831072111.3569680-15-yi.zhang@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | buffer: remove ll_rw_block() | expand |
On Wed 31-08-22 15:21:11, Zhang Yi wrote: > bh_submit_read() has no user anymore, just remove it. > > 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 | 25 ------------------------- > include/linux/buffer_head.h | 1 - > 2 files changed, 26 deletions(-) > > diff --git a/fs/buffer.c b/fs/buffer.c > index d1d09e2dacc2..fa7c2dbcef4c 100644 > --- a/fs/buffer.c > +++ b/fs/buffer.c > @@ -3029,31 +3029,6 @@ void __bh_read_batch(struct buffer_head *bhs[], > } > EXPORT_SYMBOL(__bh_read_batch); > > -/** > - * bh_submit_read - Submit a locked buffer for reading > - * @bh: struct buffer_head > - * > - * Returns zero on success and -EIO on error. > - */ > -int bh_submit_read(struct buffer_head *bh) > -{ > - BUG_ON(!buffer_locked(bh)); > - > - if (buffer_uptodate(bh)) { > - unlock_buffer(bh); > - return 0; > - } > - > - get_bh(bh); > - bh->b_end_io = end_buffer_read_sync; > - submit_bh(REQ_OP_READ, bh); > - wait_on_buffer(bh); > - if (buffer_uptodate(bh)) > - return 0; > - return -EIO; > -} > -EXPORT_SYMBOL(bh_submit_read); > - > void __init buffer_init(void) > { > unsigned long nrpages; > diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h > index 1c93ff8c8f51..576f3609ac4e 100644 > --- a/include/linux/buffer_head.h > +++ b/include/linux/buffer_head.h > @@ -230,7 +230,6 @@ int submit_bh(blk_opf_t, struct buffer_head *); > void write_boundary_block(struct block_device *bdev, > sector_t bblock, unsigned blocksize); > int bh_uptodate_or_lock(struct buffer_head *bh); > -int bh_submit_read(struct buffer_head *bh); > int __bh_read(struct buffer_head *bh, blk_opf_t op_flags, bool wait); > void __bh_read_batch(struct buffer_head *bhs[], > int nr, blk_opf_t op_flags, bool force_lock); > -- > 2.31.1 >
diff --git a/fs/buffer.c b/fs/buffer.c index d1d09e2dacc2..fa7c2dbcef4c 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -3029,31 +3029,6 @@ void __bh_read_batch(struct buffer_head *bhs[], } EXPORT_SYMBOL(__bh_read_batch); -/** - * bh_submit_read - Submit a locked buffer for reading - * @bh: struct buffer_head - * - * Returns zero on success and -EIO on error. - */ -int bh_submit_read(struct buffer_head *bh) -{ - BUG_ON(!buffer_locked(bh)); - - if (buffer_uptodate(bh)) { - unlock_buffer(bh); - return 0; - } - - get_bh(bh); - bh->b_end_io = end_buffer_read_sync; - submit_bh(REQ_OP_READ, bh); - wait_on_buffer(bh); - if (buffer_uptodate(bh)) - return 0; - return -EIO; -} -EXPORT_SYMBOL(bh_submit_read); - void __init buffer_init(void) { unsigned long nrpages; diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 1c93ff8c8f51..576f3609ac4e 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -230,7 +230,6 @@ int submit_bh(blk_opf_t, struct buffer_head *); void write_boundary_block(struct block_device *bdev, sector_t bblock, unsigned blocksize); int bh_uptodate_or_lock(struct buffer_head *bh); -int bh_submit_read(struct buffer_head *bh); int __bh_read(struct buffer_head *bh, blk_opf_t op_flags, bool wait); void __bh_read_batch(struct buffer_head *bhs[], int nr, blk_opf_t op_flags, bool force_lock);
bh_submit_read() has no user anymore, just remove it. Signed-off-by: Zhang Yi <yi.zhang@huawei.com> --- fs/buffer.c | 25 ------------------------- include/linux/buffer_head.h | 1 - 2 files changed, 26 deletions(-)