diff options
| author | Li Zefan <lizf@cn.fujitsu.com> | 2010-12-17 07:21:50 +0100 |
|---|---|---|
| committer | Li Zefan <lizf@cn.fujitsu.com> | 2010-12-22 16:15:45 +0100 |
| commit | 261507a02ccba9afda919852263b6bc1581ce1ef (patch) | |
| tree | c16bc657ff4e29a87042ceb379487f24dff01035 /fs/btrfs/ioctl.c | |
| parent | btrfs: Fix error handling in zlib (diff) | |
| download | linux-261507a02ccba9afda919852263b6bc1581ce1ef.tar.xz linux-261507a02ccba9afda919852263b6bc1581ce1ef.zip | |
btrfs: Allow to add new compression algorithm
Make the code aware of compression type, instead of always assuming
zlib compression.
Also make the zlib workspace function as common code for all
compression types.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index f87552a1d7ea..8cb86d4d763c 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -683,7 +683,7 @@ static int btrfs_defrag_file(struct file *file, total_read++; mutex_lock(&inode->i_mutex); if (range->flags & BTRFS_DEFRAG_RANGE_COMPRESS) - BTRFS_I(inode)->force_compress = 1; + BTRFS_I(inode)->force_compress = BTRFS_COMPRESS_ZLIB; ret = btrfs_delalloc_reserve_space(inode, PAGE_CACHE_SIZE); if (ret) @@ -781,7 +781,7 @@ loop_unlock: atomic_dec(&root->fs_info->async_submit_draining); mutex_lock(&inode->i_mutex); - BTRFS_I(inode)->force_compress = 0; + BTRFS_I(inode)->force_compress = BTRFS_COMPRESS_NONE; mutex_unlock(&inode->i_mutex); } |