diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-07-15 22:29:37 (GMT) |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-02-01 16:49:47 (GMT) |
| commit | 64a167011bcabc1e855658387c8a4464b71f3138 (patch) | |
| tree | 768b39580c96931f1a47fdc0a8959e3e473df5a6 /fs/btrfs/ctree.h | |
| parent | 3c911608085bf2d5a0822c418129f96a2a89d1b5 (diff) | |
| download | linux-fsl-qoriq-64a167011bcabc1e855658387c8a4464b71f3138.tar.xz | |
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/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 547b7b0..0ab51be 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3459,9 +3459,9 @@ int btrfs_writepages(struct address_space *mapping, struct writeback_control *wbc); int btrfs_create_subvol_root(struct btrfs_trans_handle *trans, struct btrfs_root *new_root, u64 new_dirid); -int btrfs_merge_bio_hook(struct page *page, unsigned long offset, - size_t size, struct bio *bio, unsigned long bio_flags); - +int btrfs_merge_bio_hook(int rw, struct page *page, unsigned long offset, + size_t size, struct bio *bio, + unsigned long bio_flags); int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf); int btrfs_readpage(struct file *file, struct page *page); void btrfs_evict_inode(struct inode *inode); |