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/extent_io.h | |
parent | 3c911608085bf2d5a0822c418129f96a2a89d1b5 (diff) | |
download | blackbird-obmc-linux-64a167011bcabc1e855658387c8a4464b71f3138.tar.gz blackbird-obmc-linux-64a167011bcabc1e855658387c8a4464b71f3138.zip |
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/extent_io.h')
-rw-r--r-- | fs/btrfs/extent_io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h index 2eacfabd3263..b14b36a80eba 100644 --- a/fs/btrfs/extent_io.h +++ b/fs/btrfs/extent_io.h @@ -72,7 +72,7 @@ struct extent_io_ops { int (*writepage_start_hook)(struct page *page, u64 start, u64 end); int (*writepage_io_hook)(struct page *page, u64 start, u64 end); extent_submit_bio_hook_t *submit_bio_hook; - int (*merge_bio_hook)(struct page *page, unsigned long offset, + int (*merge_bio_hook)(int rw, struct page *page, unsigned long offset, size_t size, struct bio *bio, unsigned long bio_flags); int (*readpage_io_hook)(struct page *page, u64 start, u64 end); |