diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-05-22 12:33:42 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-05-22 12:33:42 -0400 |
| commit | 945d8962ceee6bb273365d0bdf42f763225b290f (patch) | |
| tree | 43f5617022c7c947c3c63664e49eb9575ab82f2f /fs/btrfs/compression.h | |
| parent | 0d0ca30f180906224be6279788f2b202cfd959d8 (diff) | |
| parent | 4ea028859bbdad34b84c9951fbb832ae10c6a96c (diff) | |
| download | op-kernel-dev-945d8962ceee6bb273365d0bdf42f763225b290f.zip op-kernel-dev-945d8962ceee6bb273365d0bdf42f763225b290f.tar.gz | |
Merge branch 'cleanups' of git://repo.or.cz/linux-2.6/btrfs-unstable into inode_numbers
Conflicts:
fs/btrfs/extent-tree.c
fs/btrfs/free-space-cache.c
fs/btrfs/inode.c
fs/btrfs/tree-log.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/compression.h')
| -rw-r--r-- | fs/btrfs/compression.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h index 5100017..a12059f 100644 --- a/fs/btrfs/compression.h +++ b/fs/btrfs/compression.h @@ -37,7 +37,7 @@ int btrfs_decompress(int type, unsigned char *data_in, struct page *dest_page, int btrfs_decompress_buf2page(char *buf, unsigned long buf_start, unsigned long total_out, u64 disk_start, struct bio_vec *bvec, int vcnt, - unsigned long *page_index, + unsigned long *pg_index, unsigned long *pg_offset); int btrfs_submit_compressed_write(struct inode *inode, u64 start, |
