From: Chandan Rajendra <chandan@linux.vnet.ibm.com>
To: clm@fb.com, jbacik@fb.com, dsterba@suse.com
Cc: Chandan Rajendra <chandan@linux.vnet.ibm.com>,
linux-btrfs@vger.kernel.org
Subject: [PATCH V20 17/19] Btrfs: subpage-blocksize: __btrfs_lookup_bio_sums: Set offset when moving to a new bio_vec
Date: Mon, 4 Jul 2016 10:04:37 +0530 [thread overview]
Message-ID: <1467606879-14181-18-git-send-email-chandan@linux.vnet.ibm.com> (raw)
In-Reply-To: <1467606879-14181-1-git-send-email-chandan@linux.vnet.ibm.com>
In __btrfs_lookup_bio_sums() we set the file offset value at the
beginning of every iteration of the while loop. This is incorrect since
the blocks mapped by the current bvec->bv_page might not yet have been
completely processed.
This commit fixes the issue by setting the file offset value when we
move to the next bvec of the bio.
Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
---
fs/btrfs/file-item.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index 62a81ee..fb6a7e8 100644
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -222,11 +222,11 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root,
disk_bytenr = (u64)bio->bi_iter.bi_sector << 9;
if (dio)
offset = logical_offset;
+ else
+ offset = page_offset(bvec->bv_page) + bvec->bv_offset;
page_bytes_left = bvec->bv_len;
while (bio_index < bio->bi_vcnt) {
- if (!dio)
- offset = page_offset(bvec->bv_page) + bvec->bv_offset;
count = btrfs_find_ordered_sum(inode, offset, disk_bytenr,
(u32 *)csum, nblocks);
if (count)
@@ -301,6 +301,9 @@ found:
goto done;
}
bvec++;
+ if (!dio)
+ offset = page_offset(bvec->bv_page)
+ + bvec->bv_offset;
page_bytes_left = bvec->bv_len;
}
--
2.5.5
next prev parent reply other threads:[~2016-07-04 4:36 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-04 4:34 [PATCH V20 00/19] Allow I/O on blocks whose size is less than page size Chandan Rajendra
2016-07-04 4:34 ` [PATCH V20 01/19] Btrfs: subpage-blocksize: Fix whole page read Chandan Rajendra
2016-07-26 16:11 ` Josef Bacik
2016-07-27 10:15 ` Chandan Rajendra
2016-07-04 4:34 ` [PATCH V20 02/19] Btrfs: subpage-blocksize: Fix whole page write Chandan Rajendra
2016-07-26 17:18 ` Josef Bacik
2016-07-04 4:34 ` [PATCH V20 03/19] Btrfs: subpage-blocksize: Make sure delalloc range intersects with the locked page's range Chandan Rajendra
2016-07-26 17:19 ` Josef Bacik
2016-07-04 4:34 ` [PATCH V20 04/19] Btrfs: subpage-blocksize: Define extent_buffer_head Chandan Rajendra
2016-07-26 17:42 ` Josef Bacik
2016-07-27 14:49 ` Chandan Rajendra
2016-07-04 4:34 ` [PATCH V20 05/19] Btrfs: subpage-blocksize: Read tree blocks whose size is < PAGE_SIZE Chandan Rajendra
2016-07-04 4:34 ` [PATCH V20 06/19] Btrfs: subpage-blocksize: Write only dirty extent buffers belonging to a page Chandan Rajendra
2016-07-04 4:34 ` [PATCH V20 07/19] Btrfs: subpage-blocksize: Allow mounting filesystems where sectorsize < PAGE_SIZE Chandan Rajendra
2016-07-04 4:34 ` [PATCH V20 08/19] Btrfs: subpage-blocksize: Deal with partial ordered extent allocations Chandan Rajendra
2016-07-04 4:34 ` [PATCH V20 09/19] Btrfs: subpage-blocksize: Explicitly track I/O status of blocks of an ordered extent Chandan Rajendra
2016-07-04 4:34 ` [PATCH V20 10/19] Btrfs: subpage-blocksize: btrfs_punch_hole: Fix uptodate blocks check Chandan Rajendra
2016-07-04 4:34 ` [PATCH V20 11/19] Btrfs: subpage-blocksize: Prevent writes to an extent buffer when PG_writeback flag is set Chandan Rajendra
2016-07-04 4:34 ` [PATCH V20 12/19] Revert "btrfs: fix lockups from btrfs_clear_path_blocking" Chandan Rajendra
2016-07-04 4:34 ` [PATCH V20 13/19] Btrfs: subpage-blocksize: Fix file defragmentation code Chandan Rajendra
2016-07-04 4:34 ` [PATCH V20 14/19] Btrfs: subpage-blocksize: Enable dedupe ioctl Chandan Rajendra
2016-07-04 4:34 ` [PATCH V20 15/19] Btrfs: subpage-blocksize: btrfs_clone: Flush dirty blocks of a page that do not map the clone range Chandan Rajendra
2016-07-04 4:34 ` [PATCH V20 16/19] Btrfs: subpage-blocksize: Make file extent relocate code subpage blocksize aware Chandan Rajendra
2016-07-04 4:34 ` Chandan Rajendra [this message]
2016-07-04 4:34 ` [PATCH V20 18/19] Btrfs: subpage-blocksize: Disable compression Chandan Rajendra
2016-07-04 4:34 ` [PATCH V20 19/19] Btrfs: subpage-blocksize: Rate limit scrub error message Chandan Rajendra
2016-07-12 16:06 ` David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1467606879-14181-18-git-send-email-chandan@linux.vnet.ibm.com \
--to=chandan@linux.vnet.ibm.com \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=jbacik@fb.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).