Unverified Commit c20bc9c6 authored by Konstantin Komarov's avatar Konstantin Komarov
Browse files

fs/ntfs3: Use bh_read to simplify code 



The duplicating code is replaced by a generic function bh_read()

Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent ec275bf9

fs/ntfs3/file.c

+2 −8
Original line number Diff line number Diff line
@@ -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;

				}

			}

fs/ntfs3/inode.c

+1 −0
Original line number Diff line number Diff line
@@ -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;