From: Li Zefan <lizf@cn.fujitsu.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 4/5] btrfs: Allow to specify compress method when defrag
Date: Mon, 25 Oct 2010 15:12:50 +0800 [thread overview]
Message-ID: <4CC52DF2.2040803@cn.fujitsu.com> (raw)
In-Reply-To: <4CC52D9A.3030709@cn.fujitsu.com>
Update defrag ioctl, so one can choose lzo or zlib when turning
on compression in defrag operation.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
fs/btrfs/ioctl.c | 6 +++++-
fs/btrfs/ioctl.h | 9 ++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index ecc49ee..2ea05df 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -584,8 +584,12 @@ static int btrfs_defrag_file(struct file *file,
}
total_read++;
mutex_lock(&inode->i_mutex);
- if (range->flags & BTRFS_DEFRAG_RANGE_COMPRESS)
+ if (range->flags & BTRFS_DEFRAG_RANGE_COMPRESS) {
BTRFS_I(inode)->force_compress = BTRFS_COMPRESS_ZLIB;
+ if (range->compress_type)
+ BTRFS_I(inode)->force_compress =
+ range->compress_type;
+ }
ret = btrfs_delalloc_reserve_space(inode, PAGE_CACHE_SIZE);
if (ret)
diff --git a/fs/btrfs/ioctl.h b/fs/btrfs/ioctl.h
index 424694a..776a2b4 100644
--- a/fs/btrfs/ioctl.h
+++ b/fs/btrfs/ioctl.h
@@ -122,8 +122,15 @@ struct btrfs_ioctl_defrag_range_args {
*/
__u32 extent_thresh;
+ /*
+ * which compression method to use if turning on compression
+ * for this defrag operation. If unspecified, zlib will
+ * be used
+ */
+ __u32 compress_type;
+
/* spare for later */
- __u32 unused[5];
+ __u32 unused[4];
};
struct btrfs_ioctl_space_info {
--
1.7.0.1
next prev parent reply other threads:[~2010-10-25 7:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-25 7:11 [PATCH 0/5] btrfs: Add lzo compression support Li Zefan
2010-10-25 7:11 ` [PATCH 1/5] btrfs: Fix bugs in zlib workspace Li Zefan
2010-10-25 7:12 ` [PATCH 2/5] btrfs: Allow to add new compression algorithm Li Zefan
2010-10-25 7:12 ` [PATCH 3/5] btrfs: Add lzo compression support Li Zefan
2010-10-25 7:12 ` Li Zefan [this message]
2010-10-25 7:13 ` [PATCH 5/5] btrfs: Extract duplicate decompress code Li Zefan
2010-10-26 2:13 ` [PATCH 0/5] btrfs: Add lzo compression support Chris Mason
2010-10-26 2:34 ` Li Zefan
2010-11-15 18:55 ` Mitch Harder
2010-11-16 0:57 ` Li Zefan
2010-11-16 18:51 ` Mitch Harder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CC52DF2.2040803@cn.fujitsu.com \
--to=lizf@cn.fujitsu.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.