diff mbox

[RESEND] btrfs-progs: allow "no" to disable compression for convenience

Message ID 87po9p7uu9.wl-satoru.takeuchi@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Satoru Takeuchi Oct. 14, 2017, 12:54 p.m. UTC
It's messy to use "" to disable compression. Introduce the new value "no"
which can also be used for this purpose.

Signed-off-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
---
 Documentation/btrfs-property.asciidoc | 2 +-
 props.c                               | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

Comments

Koen Kooi Oct. 14, 2017, 4:19 p.m. UTC | #1
Op 14-10-17 om 14:54 schreef Satoru Takeuchi:
> It's messy to use "" to disable compression. Introduce the new value "no"
> which can also be used for this purpose.

Wouldn't 'none' be a better fit?

regards,

Koen

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Satoru Takeuchi Oct. 14, 2017, 11:02 p.m. UTC | #2
At Sat, 14 Oct 2017 18:19:14 +0200,
Koen Kooi wrote:
> 
> Op 14-10-17 om 14:54 schreef Satoru Takeuchi:
> > It's messy to use "" to disable compression. Introduce the new value "no"
> > which can also be used for this purpose.
> 
> Wouldn't 'none' be a better fit?

I consider "no" is better because we use `nocompress` or `compress=no`
mount option to disable compression. I want to unify the expression.

Thanks,
Satoru

> 
> regards,
> 
> Koen
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Sterba Oct. 17, 2017, 6:16 p.m. UTC | #3
On Sat, Oct 14, 2017 at 09:54:54PM +0900, Satoru Takeuchi wrote:
> It's messy to use "" to disable compression. Introduce the new value "no"
> which can also be used for this purpose.
> 
> Signed-off-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Sterba Oct. 17, 2017, 6:16 p.m. UTC | #4
On Sat, Oct 14, 2017 at 06:19:14PM +0200, Koen Kooi wrote:
> Op 14-10-17 om 14:54 schreef Satoru Takeuchi:
> > It's messy to use "" to disable compression. Introduce the new value "no"
> > which can also be used for this purpose.
> 
> Wouldn't 'none' be a better fit?

'none' will be also accepted
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/Documentation/btrfs-property.asciidoc b/Documentation/btrfs-property.asciidoc
index 7ed6a7d..97b90d6 100644
--- a/Documentation/btrfs-property.asciidoc
+++ b/Documentation/btrfs-property.asciidoc
@@ -43,7 +43,7 @@  read-only flag of subvolume: true or false
 label::::
 label of device
 compression::::
-compression setting for an inode: lzo, zlib, zstd, or "" (empty string)
+compression setting for an inode: lzo, zlib, zstd, no, or "" (empty string). Both no and "" are for disabling compression.
 
 *list* [-t <type>] <object>::
 Lists available properties with their descriptions for the given object.
diff --git a/props.c b/props.c
index a7e3e96..a2df868 100644
--- a/props.c
+++ b/props.c
@@ -142,9 +142,11 @@  static int prop_compression(enum prop_object_type type,
 	memcpy(xattr_name + XATTR_BTRFS_PREFIX_LEN, name, strlen(name));
 	xattr_name[XATTR_BTRFS_PREFIX_LEN + strlen(name)] = '\0';
 
-	if (value)
+	if (value) {
+		if (!strcmp(value, "no"))
+			value = "";
 		sret = fsetxattr(fd, xattr_name, value, strlen(value), 0);
-	else
+	} else
 		sret = fgetxattr(fd, xattr_name, NULL, 0);
 	if (sret < 0) {
 		ret = -errno;