summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/inode.c
diff options
context:
space:
mode:
authorChris Mason2008-04-21 16:03:05 +0200
committerChris Mason2008-09-25 17:04:02 +0200
commitf2d8d74d7874f8f81222363cd6459a365796e35a (patch)
tree2d081c85d9e88006f084cc17fc1ffa262b885e37 /fs/btrfs/inode.c
parentBtrfs: Remove debugging statements from the invalidatepage calls (diff)
downloadkernel-qcow2-linux-f2d8d74d7874f8f81222363cd6459a365796e35a.tar.gz
kernel-qcow2-linux-f2d8d74d7874f8f81222363cd6459a365796e35a.tar.xz
kernel-qcow2-linux-f2d8d74d7874f8f81222363cd6459a365796e35a.zip
Btrfs: Make an unplug function that doesn't unplug every spindle
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r--fs/btrfs/inode.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 5b1514e58de4..e875c7c8a647 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -313,13 +313,9 @@ int btrfs_merge_bio_hook(struct page *page, unsigned long offset,
u64 logical = bio->bi_sector << 9;
u64 length = 0;
u64 map_length;
- struct bio_vec *bvec;
- int i;
int ret;
- bio_for_each_segment(bvec, bio, i) {
- length += bvec->bv_len;
- }
+ length = bio->bi_size;
map_tree = &root->fs_info->mapping_tree;
map_length = length;
ret = btrfs_map_block(map_tree, READ, logical,