From: Andrew Mahone <andrew.mahone@gmail.com>
To: linux-btrfs@vger.kernel.org
Cc: Andrew Mahone <andrew.mahone@gmail.com>
Subject: [PATCH 5/5] btrfs: enable lz4/lz4hc compression
Date: Sat, 23 Jun 2012 04:05:48 -0400 [thread overview]
Message-ID: <1340438748-348-6-git-send-email-andrew.mahone@gmail.com> (raw)
In-Reply-To: <1340438748-348-1-git-send-email-andrew.mahone@gmail.com>
Signed-off-by: Andrew Mahone <andrew.mahone@gmail.com>
---
fs/btrfs/compression.c | 2 ++
fs/btrfs/compression.h | 2 ++
fs/btrfs/super.c | 6 ------
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 86eff48..3ed7251 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -733,6 +733,8 @@ static wait_queue_head_t comp_workspace_wait[BTRFS_COMPRESS_TYPES];
struct btrfs_compress_op *btrfs_compress_op[] = {
&btrfs_zlib_compress,
&btrfs_lzo_compress,
+ &btrfs_lz4_compress,
+ &btrfs_lz4hc_compress,
};
void __init btrfs_init_compress(void)
diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h
index 9afb0a6..2a43913 100644
--- a/fs/btrfs/compression.h
+++ b/fs/btrfs/compression.h
@@ -79,5 +79,7 @@ struct btrfs_compress_op {
extern struct btrfs_compress_op btrfs_zlib_compress;
extern struct btrfs_compress_op btrfs_lzo_compress;
+extern struct btrfs_compress_op btrfs_lz4_compress;
+extern struct btrfs_compress_op btrfs_lz4hc_compress;
#endif
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 5824886..af6f429 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -405,16 +405,10 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
compress_type = "lz4";
info->compress_type = BTRFS_COMPRESS_LZ4;
btrfs_set_opt(info->mount_opt, COMPRESS);
- /* remove when implemented */
- ret = -EINVAL;
- goto out;
} else if (strcmp(args[0].from, "lz4hc") == 0) {
compress_type = "lz4hc";
info->compress_type = BTRFS_COMPRESS_LZ4HC;
btrfs_set_opt(info->mount_opt, COMPRESS);
- /* remove when implemented */
- ret = -EINVAL;
- goto out;
} else if (strncmp(args[0].from, "no", 2) == 0) {
compress_type = "no";
info->compress_type = BTRFS_COMPRESS_NONE;
--
1.7.11
next prev parent reply other threads:[~2012-06-23 8:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-23 8:05 [PATCH 0/5] btrfs: lz4/lz4hc compression Andrew Mahone
2012-06-23 8:05 ` [PATCH 1/5] btrfs: lz4: import lz4/lz4hc C and header files Andrew Mahone
2012-06-23 8:05 ` [PATCH 2/5] btrfs: lz4: add incompat flags and compression types Andrew Mahone
2012-06-23 20:21 ` Andrew Mahone
2012-06-23 8:05 ` [PATCH 3/5] btrfs: lz4: add lz4_wrapper implementing btrfs compression interface Andrew Mahone
2012-06-23 8:05 ` [PATCH 4/5] btrfs: lz4: add lz4 files in Makefile Andrew Mahone
2012-06-23 8:05 ` Andrew Mahone [this message]
2012-06-25 13:19 ` [PATCH 0/5] btrfs: lz4/lz4hc compression David Sterba
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=1340438748-348-6-git-send-email-andrew.mahone@gmail.com \
--to=andrew.mahone@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).