summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2009-09-30 16:47:08 -0400
committerChris Mason <chris.mason@oracle.com>2009-10-01 10:27:01 -0400
commit35d62a942db5ae03104929fe7397835b572c4bc4 (patch)
tree91ea5b0a79e898f57cd644e1ff0437748aa0781b
parentdd7e0b7b02ccff73b87032e20fc5b4f2c1cfcc14 (diff)
downloadop-kernel-dev-35d62a942db5ae03104929fe7397835b572c4bc4.zip
op-kernel-dev-35d62a942db5ae03104929fe7397835b572c4bc4.tar.gz
Btrfs: fix arguments to btrfs_wait_on_page_writeback_range
wait_on_page_writeback_range/btrfs_wait_on_page_writeback_range takes a pagecache offset, not a byte offset into the file. Shift the arguments around to wait for the correct range Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Chris Mason <chris.mason@oracle.com>
-rw-r--r--fs/btrfs/disk-io.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index ece8d1e..69dce50 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -829,7 +829,9 @@ int btrfs_write_tree_block(struct extent_buffer *buf)
int btrfs_wait_tree_block_writeback(struct extent_buffer *buf)
{
return btrfs_wait_on_page_writeback_range(buf->first_page->mapping,
- buf->start, buf->start + buf->len - 1);
+ buf->start >> PAGE_CACHE_SHIFT,
+ (buf->start + buf->len - 1) >>
+ PAGE_CACHE_SHIFT);
}
struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,
OpenPOWER on IntegriCloud