| Message ID | 20220831072111.3569680-12-yi.zhang@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | buffer: remove ll_rw_block() | expand |
On Wed 31-08-22 15:21:08, Zhang Yi wrote: > ll_rw_block() is not safe for the sync read path because it cannot > guarantee that submitting read IO if the buffer has been locked. We > could get false positive EIO after wait_on_buffer() if the buffer has > been locked by others. So stop using ll_rw_block() in ufs. > > 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/ufs/balloc.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c > index bd810d8239f2..bbc2159eece4 100644 > --- a/fs/ufs/balloc.c > +++ b/fs/ufs/balloc.c > @@ -296,9 +296,7 @@ static void ufs_change_blocknr(struct inode *inode, sector_t beg, > if (!buffer_mapped(bh)) > map_bh(bh, inode->i_sb, oldb + pos); > if (!buffer_uptodate(bh)) { > - ll_rw_block(REQ_OP_READ, 1, &bh); > - wait_on_buffer(bh); > - if (!buffer_uptodate(bh)) { > + if (bh_read(bh, 0)) { > ufs_error(inode->i_sb, __func__, > "read of block failed\n"); > break; > -- > 2.31.1 >
diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c index bd810d8239f2..bbc2159eece4 100644 --- a/fs/ufs/balloc.c +++ b/fs/ufs/balloc.c @@ -296,9 +296,7 @@ static void ufs_change_blocknr(struct inode *inode, sector_t beg, if (!buffer_mapped(bh)) map_bh(bh, inode->i_sb, oldb + pos); if (!buffer_uptodate(bh)) { - ll_rw_block(REQ_OP_READ, 1, &bh); - wait_on_buffer(bh); - if (!buffer_uptodate(bh)) { + if (bh_read(bh, 0)) { ufs_error(inode->i_sb, __func__, "read of block failed\n"); break;
ll_rw_block() is not safe for the sync read path because it cannot guarantee that submitting read IO if the buffer has been locked. We could get false positive EIO after wait_on_buffer() if the buffer has been locked by others. So stop using ll_rw_block() in ufs. Signed-off-by: Zhang Yi <yi.zhang@huawei.com> --- fs/ufs/balloc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)