1 files changed, 54 insertions, 18 deletions
diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h
index 421f5b4aa715..51000174b9d7 100644
--- a/fs/btrfs/compression.h
+++ b/fs/btrfs/compression.h
@@ -19,24 +19,27 @@
 #ifndef __BTRFS_COMPRESSION_
 #define __BTRFS_COMPRESSION_
-int btrfs_zlib_decompress(unsigned char *data_in,
+int btrfs_init_compress(void);
-                          struct page *dest_page,
+void btrfs_exit_compress(void);
-                          unsigned long start_byte,
-                          size_t srclen, size_t destlen);
+int btrfs_compress_pages(int type, struct address_space *mapping,
-int btrfs_zlib_compress_pages(struct address_space *mapping,
+                         u64 start, unsigned long len,
-                              u64 start, unsigned long len,
+                         struct page **pages,
-                              struct page **pages,
+                         unsigned long nr_dest_pages,
-                              unsigned long nr_dest_pages,
+                         unsigned long *out_pages,
-                              unsigned long *out_pages,
+                         unsigned long *total_in,
-                              unsigned long *total_in,
+                         unsigned long *total_out,
-                              unsigned long *total_out,
+                         unsigned long max_out);
-                              unsigned long max_out);
+int btrfs_decompress_biovec(int type, struct page **pages_in, u64 disk_start,
-int btrfs_zlib_decompress_biovec(struct page **pages_in,
+                            struct bio_vec *bvec, int vcnt, size_t srclen);
-                              u64 disk_start,
+int btrfs_decompress(int type, unsigned char *data_in, struct page *dest_page,
-                              struct bio_vec *bvec,
+                     unsigned long start_byte, size_t srclen, size_t destlen);
-                              int vcnt,
+int btrfs_decompress_buf2page(char *buf, unsigned long buf_start,
-                              size_t srclen);
+                              unsigned long total_out, u64 disk_start,
-void btrfs_zlib_exit(void);
+                              struct bio_vec *bvec, int vcnt,
+                              unsigned long *page_index,
+                              unsigned long *pg_offset);
 int btrfs_submit_compressed_write(struct inode *inode, u64 start,
                                  unsigned long len, u64 disk_start,
                                  unsigned long compressed_len,
@@ -44,4 +47,37 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,
                                  unsigned long nr_pages);
 int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
                                 int mirror_num, unsigned long bio_flags);
+struct btrfs_compress_op {
+        struct list_head *(*alloc_workspace)(void);
+        void (*free_workspace)(struct list_head *workspace);
+        int (*compress_pages)(struct list_head *workspace,
+                              struct address_space *mapping,
+                              u64 start, unsigned long len,
+                              struct page **pages,
+                              unsigned long nr_dest_pages,
+                              unsigned long *out_pages,
+                              unsigned long *total_in,
+                              unsigned long *total_out,
+                              unsigned long max_out);
+        int (*decompress_biovec)(struct list_head *workspace,
+                                 struct page **pages_in,
+                                 u64 disk_start,
+                                 struct bio_vec *bvec,
+                                 int vcnt,
+                                 size_t srclen);
+        int (*decompress)(struct list_head *workspace,
+                          unsigned char *data_in,
+                          struct page *dest_page,
+                          unsigned long start_byte,
+                          size_t srclen, size_t destlen);
+};
+extern struct btrfs_compress_op btrfs_zlib_compress;
+extern struct btrfs_compress_op btrfs_lzo_compress;
 #endif

diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h index 421f5b4aa715..51000174b9d7 100644 --- a/fs/btrfs/compression.h +++ b/fs/btrfs/compression.h
@@ -19,24 +19,27 @@
19	#ifndef __BTRFS_COMPRESSION_	19	#ifndef __BTRFS_COMPRESSION_
20	#define __BTRFS_COMPRESSION_	20	#define __BTRFS_COMPRESSION_
21		21
22	int btrfs_zlib_decompress(unsigned char *data_in,	22	int btrfs_init_compress(void);
23	struct page *dest_page,	23	void btrfs_exit_compress(void);
24	unsigned long start_byte,	24
25	size_t srclen, size_t destlen);	25	int btrfs_compress_pages(int type, struct address_space *mapping,
26	int btrfs_zlib_compress_pages(struct address_space *mapping,	26	u64 start, unsigned long len,
27	u64 start, unsigned long len,	27	struct page **pages,
28	struct page **pages,	28	unsigned long nr_dest_pages,
29	unsigned long nr_dest_pages,	29	unsigned long *out_pages,
30	unsigned long *out_pages,	30	unsigned long *total_in,
31	unsigned long *total_in,	31	unsigned long *total_out,
32	unsigned long *total_out,	32	unsigned long max_out);
33	unsigned long max_out);	33	int btrfs_decompress_biovec(int type, struct page **pages_in, u64 disk_start,
34	int btrfs_zlib_decompress_biovec(struct page **pages_in,	34	struct bio_vec *bvec, int vcnt, size_t srclen);
35	u64 disk_start,	35	int btrfs_decompress(int type, unsigned char data_in, struct page dest_page,
36	struct bio_vec *bvec,	36	unsigned long start_byte, size_t srclen, size_t destlen);
37	int vcnt,	37	int btrfs_decompress_buf2page(char *buf, unsigned long buf_start,
38	size_t srclen);	38	unsigned long total_out, u64 disk_start,
39	void btrfs_zlib_exit(void);	39	struct bio_vec *bvec, int vcnt,
		40	unsigned long *page_index,
		41	unsigned long *pg_offset);
		42
40	int btrfs_submit_compressed_write(struct inode *inode, u64 start,	43	int btrfs_submit_compressed_write(struct inode *inode, u64 start,
41	unsigned long len, u64 disk_start,	44	unsigned long len, u64 disk_start,
42	unsigned long compressed_len,	45	unsigned long compressed_len,
@@ -44,4 +47,37 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,
44	unsigned long nr_pages);	47	unsigned long nr_pages);
45	int btrfs_submit_compressed_read(struct inode inode, struct bio bio,	48	int btrfs_submit_compressed_read(struct inode inode, struct bio bio,
46	int mirror_num, unsigned long bio_flags);	49	int mirror_num, unsigned long bio_flags);
		50
		51	struct btrfs_compress_op {
		52	struct list_head (alloc_workspace)(void);
		53
		54	void (free_workspace)(struct list_head workspace);
		55
		56	int (compress_pages)(struct list_head workspace,
		57	struct address_space *mapping,
		58	u64 start, unsigned long len,
		59	struct page **pages,
		60	unsigned long nr_dest_pages,
		61	unsigned long *out_pages,
		62	unsigned long *total_in,
		63	unsigned long *total_out,
		64	unsigned long max_out);
		65
		66	int (decompress_biovec)(struct list_head workspace,
		67	struct page **pages_in,
		68	u64 disk_start,
		69	struct bio_vec *bvec,
		70	int vcnt,
		71	size_t srclen);
		72
		73	int (decompress)(struct list_head workspace,
		74	unsigned char *data_in,
		75	struct page *dest_page,
		76	unsigned long start_byte,
		77	size_t srclen, size_t destlen);
		78	};
		79
		80	extern struct btrfs_compress_op btrfs_zlib_compress;
		81	extern struct btrfs_compress_op btrfs_lzo_compress;
		82
47	#endif	83	#endif