Merge branch 'raid56-experimental' into for-linus-3.9

Signed-off-by: Chris Mason <chris.mason@fusionio.com>

Conflicts:
	fs/btrfs/ctree.h
	fs/btrfs/extent-tree.c
	fs/btrfs/inode.c
	fs/btrfs/volumes.c

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 94ab2f80e7e3..15b94089abc4 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -372,7 +372,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,
                 page = compressed_pages[pg_index];
                 page->mapping = inode->i_mapping;
                 if (bio->bi_size)
-                        ret = io_tree->ops->merge_bio_hook(page, 0,
+                        ret = io_tree->ops->merge_bio_hook(WRITE, page, 0,
                                                            PAGE_CACHE_SIZE,
                                                            bio, 0);
                 else
@@ -655,7 +655,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
                 page->index = em_start >> PAGE_CACHE_SHIFT;
 
                 if (comp_bio->bi_size)
-                        ret = tree->ops->merge_bio_hook(page, 0,
+                        ret = tree->ops->merge_bio_hook(READ, page, 0,
                                                         PAGE_CACHE_SIZE,
                                                         comp_bio, 0);
                 else