| Message ID | 20220901133505.2510834-14-yi.zhang@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fs/buffer: remove ll_rw_block() | expand |
On Thu 01-09-22 21:35:04, Zhang Yi wrote: > bh_submit_read() and the uptodate check logic in bh_uptodate_or_lock() > has been integrated in bh_read() helper, so switch to use it directly. > > Signed-off-by: Zhang Yi <yi.zhang@huawei.com> Looks good to me. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/ext2/balloc.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c > index c17ccc19b938..5dc0a31f4a08 100644 > --- a/fs/ext2/balloc.c > +++ b/fs/ext2/balloc.c > @@ -126,6 +126,7 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group) > struct ext2_group_desc * desc; > struct buffer_head * bh = NULL; > ext2_fsblk_t bitmap_blk; > + int ret; > > desc = ext2_get_group_desc(sb, block_group, NULL); > if (!desc) > @@ -139,10 +140,10 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group) > block_group, le32_to_cpu(desc->bg_block_bitmap)); > return NULL; > } > - if (likely(bh_uptodate_or_lock(bh))) > + ret = bh_read(bh, 0); > + if (ret > 0) > return bh; > - > - if (bh_submit_read(bh) < 0) { > + if (ret < 0) { > brelse(bh); > ext2_error(sb, __func__, > "Cannot read block bitmap - " > -- > 2.31.1 >
On Thu, Sep 01, 2022 at 09:35:04PM +0800, Zhang Yi wrote: > bh_submit_read() and the uptodate check logic in bh_uptodate_or_lock() > has been integrated in bh_read() helper, so switch to use it directly. s/bh_read_locked/bh_read/ in the summary?
On 2022/9/2 8:30, Al Viro wrote: > On Thu, Sep 01, 2022 at 09:35:04PM +0800, Zhang Yi wrote: >> bh_submit_read() and the uptodate check logic in bh_uptodate_or_lock() >> has been integrated in bh_read() helper, so switch to use it directly. > > s/bh_read_locked/bh_read/ in the summary? > Sorry, I don't get your question, I have already replace bh_read_locked() with bh_read() in the commit message, there is no bh_read_locked in the whole patch. Am I missing something? Thanks, Yi.
On Fri, Sep 02, 2022 at 09:32:53AM +0800, Zhang Yi wrote: > On 2022/9/2 8:30, Al Viro wrote: > > On Thu, Sep 01, 2022 at 09:35:04PM +0800, Zhang Yi wrote: > >> bh_submit_read() and the uptodate check logic in bh_uptodate_or_lock() > >> has been integrated in bh_read() helper, so switch to use it directly. > > > > s/bh_read_locked/bh_read/ in the summary? > > > > Sorry, I don't get your question, I have already replace bh_read_locked() > with bh_read() in the commit message, there is no bh_read_locked in the whole > patch. Am I missing something? Take a look at the subject ;-)
On 2022/9/2 9:51, Al Viro wrote: > On Fri, Sep 02, 2022 at 09:32:53AM +0800, Zhang Yi wrote: >> On 2022/9/2 8:30, Al Viro wrote: >>> On Thu, Sep 01, 2022 at 09:35:04PM +0800, Zhang Yi wrote: >>>> bh_submit_read() and the uptodate check logic in bh_uptodate_or_lock() >>>> has been integrated in bh_read() helper, so switch to use it directly. >>> >>> s/bh_read_locked/bh_read/ in the summary? >>> >> >> Sorry, I don't get your question, I have already replace bh_read_locked() >> with bh_read() in the commit message, there is no bh_read_locked in the whole >> patch. Am I missing something? > > Take a look at the subject ;-) Oh, yes, I forgot to update the subject, will do. Thanks, Yi.
Looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c index c17ccc19b938..5dc0a31f4a08 100644 --- a/fs/ext2/balloc.c +++ b/fs/ext2/balloc.c @@ -126,6 +126,7 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group) struct ext2_group_desc * desc; struct buffer_head * bh = NULL; ext2_fsblk_t bitmap_blk; + int ret; desc = ext2_get_group_desc(sb, block_group, NULL); if (!desc) @@ -139,10 +140,10 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group) block_group, le32_to_cpu(desc->bg_block_bitmap)); return NULL; } - if (likely(bh_uptodate_or_lock(bh))) + ret = bh_read(bh, 0); + if (ret > 0) return bh; - - if (bh_submit_read(bh) < 0) { + if (ret < 0) { brelse(bh); ext2_error(sb, __func__, "Cannot read block bitmap - "
bh_submit_read() and the uptodate check logic in bh_uptodate_or_lock() has been integrated in bh_read() helper, so switch to use it directly. Signed-off-by: Zhang Yi <yi.zhang@huawei.com> --- fs/ext2/balloc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)