From: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
To: "linux-btrfs@vger.kernel.org" <linux-btrfs@vger.kernel.org>
Cc: Chris Mason <clm@fb.com>, Filipe Manana <fdmanana@suse.com>
Subject: [PATCH 2/4] btrfs: introduce new compression property to disable compression at all
Date: Fri, 19 Sep 2014 17:48:56 +0900 [thread overview]
Message-ID: <541BEDF8.7010009@jp.fujitsu.com> (raw)
In-Reply-To: <541BED3D.5020803@jp.fujitsu.com>
From: Naohiro Aota <naota@elisp.net>
This new compression property, "off", to disable compression of
the file at all.
Signed-off-by: Naohiro Aota <naota@elisp.net>
Signed-off-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
---
fs/btrfs/props.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c
index bf005f4..38efbe1 100644
--- a/fs/btrfs/props.c
+++ b/fs/btrfs/props.c
@@ -382,6 +382,8 @@ static int prop_compression_validate(const char *value, size_t len)
return 0;
else if (!strncmp("zlib", value, len))
return 0;
+ else if (!strncmp("off", value, len))
+ return 0;
return -EINVAL;
}
@@ -400,6 +402,14 @@ static int prop_compression_apply(struct inode *inode,
return 0;
}
+ if (!strncmp("off", value, len)) {
+ BTRFS_I(inode)->flags |= BTRFS_INODE_NOCOMPRESS;
+ BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS;
+ BTRFS_I(inode)->force_compress = BTRFS_COMPRESS_NONE;
+
+ return 0;
+ }
+
if (!strncmp("lzo", value, len))
type = BTRFS_COMPRESS_LZO;
else if (!strncmp("zlib", value, len))
@@ -423,5 +433,8 @@ static const char *prop_compression_extract(struct inode *inode)
return "lzo";
}
+ if (BTRFS_I(inode)->flags & BTRFS_INODE_NOCOMPRESS)
+ return "off";
+
return NULL;
}
-- 1.8.3.1
next prev parent reply other threads:[~2014-09-19 8:49 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-19 8:45 [PATCH 1/4] btrfs: correct empty compression property behavior Satoru Takeuchi
2014-09-19 8:48 ` Satoru Takeuchi [this message]
2014-09-19 8:52 ` [PATCH 3/4] btrfs: export __btrfs_set_prop Satoru Takeuchi
2014-09-19 9:05 ` [PATCH 4/4] btrfs: Fix compression related ioctl to run atomic operations in one transaction Satoru Takeuchi
2014-09-25 5:57 ` [PATCH v2 " Satoru Takeuchi
2014-09-22 12:01 ` [PATCH 3/4] btrfs: export __btrfs_set_prop David Sterba
2014-09-25 5:55 ` [PATCH v2 3/4] btrfs: Rename and export __btrfs_set_prop to be called from running transaction Satoru Takeuchi
2014-09-29 16:23 ` David Sterba
2014-09-29 16:36 ` [PATCH 1/4] btrfs: correct empty compression property behavior David Sterba
2014-10-16 1:37 ` Satoru Takeuchi
2014-10-16 7:01 ` Filipe David Manana
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=541BEDF8.7010009@jp.fujitsu.com \
--to=takeuchi_satoru@jp.fujitsu.com \
--cc=clm@fb.com \
--cc=fdmanana@suse.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).