fs/ntfs3: Use bh_read to simplify code
The duplicating code is replaced by a generic function bh_read() Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
This commit is contained in:
parent
ec275bf969
commit
c20bc9c6d8
@ -223,16 +223,10 @@ static int ntfs_zero_range(struct inode *inode, u64 vbo, u64 vbo_to)
|
||||
set_buffer_uptodate(bh);
|
||||
|
||||
if (!buffer_uptodate(bh)) {
|
||||
lock_buffer(bh);
|
||||
bh->b_end_io = end_buffer_read_sync;
|
||||
get_bh(bh);
|
||||
submit_bh(REQ_OP_READ, bh);
|
||||
|
||||
wait_on_buffer(bh);
|
||||
if (!buffer_uptodate(bh)) {
|
||||
err = bh_read(bh, 0);
|
||||
if (err < 0) {
|
||||
unlock_page(page);
|
||||
put_page(page);
|
||||
err = -EIO;
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
@ -648,6 +648,7 @@ static noinline int ntfs_get_block_vbo(struct inode *inode, u64 vbo,
|
||||
bh->b_size = block_size;
|
||||
off = vbo & (PAGE_SIZE - 1);
|
||||
set_bh_page(bh, page, off);
|
||||
|
||||
err = bh_read(bh, 0);
|
||||
if (err < 0)
|
||||
goto out;
|
||||
|
Loading…
x
Reference in New Issue
Block a user