X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fs%2Fbtrfs%2Fctree.h;h=acf22ad6115cc8e62322ca36afa28c1008c177e6;hb=239b14b32dc39232ebf9cce29ff77c4c564355fd;hp=96a4932178600b68bce9cc4e8d45cf7b9431b2b2;hpb=0d81ba5dbedef0c3970d6aa318aa84920943e6e3;p=linux-2.6-block.git

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 96a493217860..acf22ad6115c 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -1405,6 +1405,9 @@ int btrfs_csum_truncate(struct btrfs_trans_handle *trans,
 			struct btrfs_root *root, struct btrfs_path *path,
 			u64 isize);
 /* inode.c */
+int btrfs_merge_bio_hook(struct page *page, unsigned long offset,
+			 size_t size, struct bio *bio);
+
 static inline void dec_i_blocks(struct inode *inode, u64 dec)
 {
 	dec = dec >> 9;