diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-07-15 23:29:37 +0100 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-02-01 11:49:47 -0500 |
| commit | 64a167011bcabc1e855658387c8a4464b71f3138 (patch) | |
| tree | 768b39580c96931f1a47fdc0a8959e3e473df5a6 /fs/btrfs/inode.c | |
| parent | 3c911608085bf2d5a0822c418129f96a2a89d1b5 (diff) | |
| download | op-kernel-dev-64a167011bcabc1e855658387c8a4464b71f3138.zip op-kernel-dev-64a167011bcabc1e855658387c8a4464b71f3138.tar.gz | |
Btrfs: add rw argument to merge_bio_hook()
We'll want to merge writes so they can fill a full RAID[56] stripe, but
not necessarily reads.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 67ed24a..1b98c4c 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1566,7 +1566,7 @@ static void btrfs_clear_bit_hook(struct inode *inode, * extent_io.c merge_bio_hook, this must check the chunk tree to make sure * we don't create bios that span stripes or chunks */ -int btrfs_merge_bio_hook(struct page *page, unsigned long offset, +int btrfs_merge_bio_hook(int rw, struct page *page, unsigned long offset, size_t size, struct bio *bio, unsigned long bio_flags) { @@ -1581,7 +1581,7 @@ int btrfs_merge_bio_hook(struct page *page, unsigned long offset, length = bio->bi_size; map_length = length; - ret = btrfs_map_block(root->fs_info, READ, logical, + ret = btrfs_map_block(root->fs_info, rw, logical, &map_length, NULL, 0); /* Will always return 0 with map_multi == NULL */ BUG_ON(ret < 0); |
