From: Filipe David Borba Manana <fdmanana@gmail.com>
To: linux-btrfs@vger.kernel.org
Cc: Filipe David Borba Manana <fdmanana@gmail.com>
Subject: [PATCH 5/5] Btrfs-progs: add support for the compression property
Date: Tue, 12 Nov 2013 13:41:46 +0000 [thread overview]
Message-ID: <1384263706-25549-6-git-send-email-fdmanana@gmail.com> (raw)
In-Reply-To: <1384263706-25549-1-git-send-email-fdmanana@gmail.com>
With this property, one can enable compression for individual files
without the need to mount the filesystem with the compress or
compress-force options, and specify the compression algorithm.
When applied against a directory, files created under that directory
will inherit the compression property.
This requires the corresponding kernel patch, which adds the
support for the property get and set ioctls and implementation
of the compression property.
Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>
---
ioctl.h | 12 +++++++++++
props.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 85 insertions(+)
diff --git a/ioctl.h b/ioctl.h
index d21413f..b1f7928 100644
--- a/ioctl.h
+++ b/ioctl.h
@@ -465,6 +465,14 @@ struct btrfs_ioctl_qgroup_create_args {
__u64 qgroupid;
};
+struct btrfs_ioctl_getset_prop_args {
+ __u16 name_len; /* in */
+ __u16 value_len; /* in/out */
+ __u8 unused[4];
+ __u64 name_ptr; /* in */
+ __u64 value_ptr; /* in/out */
+};
+
/* Error codes as returned by the kernel */
enum btrfs_err_code {
notused,
@@ -551,6 +559,10 @@ struct btrfs_ioctl_clone_range_args {
#define BTRFS_IOC_DEFAULT_SUBVOL _IOW(BTRFS_IOCTL_MAGIC, 19, u64)
#define BTRFS_IOC_SPACE_INFO _IOWR(BTRFS_IOCTL_MAGIC, 20, \
struct btrfs_ioctl_space_args)
+#define BTRFS_IOC_GET_PROP _IOR(BTRFS_IOCTL_MAGIC, 21, \
+ struct btrfs_ioctl_getset_prop_args)
+#define BTRFS_IOC_SET_PROP _IOW(BTRFS_IOCTL_MAGIC, 21, \
+ struct btrfs_ioctl_getset_prop_args)
#define BTRFS_IOC_SNAP_CREATE_V2 _IOW(BTRFS_IOCTL_MAGIC, 23, \
struct btrfs_ioctl_vol_args_v2)
#define BTRFS_IOC_SUBVOL_CREATE_V2 _IOW(BTRFS_IOCTL_MAGIC, 24, \
diff --git a/props.c b/props.c
index 12fdc52..4a7d7ef 100644
--- a/props.c
+++ b/props.c
@@ -17,6 +17,7 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <fcntl.h>
+#include <stdint.h>
#include <unistd.h>
#include "ctree.h"
@@ -102,10 +103,82 @@ static int prop_label(enum prop_object_type type,
return ret;
}
+static int prop_compression(enum prop_object_type type,
+ const char *object,
+ const char *name,
+ const char *value)
+{
+ int ret;
+ DIR *dirstream = NULL;
+ int fd = -1;
+ struct btrfs_ioctl_getset_prop_args args;
+ char *buf = NULL;
+
+ args.name_len = strlen(name);
+ args.name_ptr = (uintptr_t) name;
+
+ if (value) {
+ args.value_len = strlen(value);
+ args.value_ptr = (uintptr_t) value;
+ } else {
+ args.value_len = 0;
+ args.value_ptr = (uintptr_t) NULL;
+ }
+
+ fd = open_file_or_dir(object, &dirstream);
+ if (fd == -1) {
+ ret = -errno;
+ fprintf(stderr, "ERROR: open %s failed. %s\n",
+ object, strerror(-ret));
+ goto out;
+ }
+
+ if (value)
+ ret = ioctl(fd, BTRFS_IOC_SET_PROP, &args);
+ else
+ ret = ioctl(fd, BTRFS_IOC_GET_PROP, &args);
+ if (ret < 0) {
+ ret = -errno;
+ if (ret != -ENODATA)
+ fprintf(stderr,
+ "ERROR: failed to %s compression for %s. %s\n",
+ value ? "set" : "get", object, strerror(-ret));
+ goto out;
+ }
+ if (!value) {
+ buf = malloc(args.value_len);
+ if (!buf) {
+ ret = -ENOMEM;
+ goto out;
+ }
+ args.value_ptr = (uintptr_t) buf;
+ ret = ioctl(fd, BTRFS_IOC_GET_PROP, &args);
+ if (ret < 0) {
+ ret = -errno;
+ fprintf(stderr,
+ "ERROR: failed to get compression for %s. %s\n",
+ object, strerror(-ret));
+ goto out;
+ }
+ fprintf(stdout, "compression=%.*s\n", args.value_len, buf);
+ }
+
+ ret = 0;
+out:
+ free(buf);
+ if (fd >= 0)
+ close_file_or_dir(fd, dirstream);
+
+ return ret;
+}
+
+
const struct prop_handler prop_handlers[] = {
{"ro", "Set/get read-only flag of subvolume.", 0, prop_object_subvol,
prop_read_only},
{"label", "Set/get label of device.", 0,
prop_object_dev | prop_object_root, prop_label},
+ {"compression", "Set/get compression for a file or directory", 0,
+ prop_object_inode, prop_compression},
{0, 0, 0, 0, 0}
};
--
1.7.9.5
next prev parent reply other threads:[~2013-11-12 13:42 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-12 13:41 [PATCH 0/5] Add support for object properties Filipe David Borba Manana
2013-11-12 13:41 ` [PATCH 1/5] Btrfs-progs: let get_label return the label instead of printing it Filipe David Borba Manana
2013-11-13 15:43 ` David Sterba
2013-11-12 13:41 ` [PATCH 2/5] Btrfs-progs: introduce btrfs property subgroup Filipe David Borba Manana
2013-11-12 13:41 ` [PATCH 3/5] Btrfs-progs: fix detection of root objects in cmds-property.c Filipe David Borba Manana
2013-11-12 13:41 ` [PATCH 4/5] Btrfs-progs: add type root to label property Filipe David Borba Manana
2013-11-12 13:41 ` Filipe David Borba Manana [this message]
2013-11-13 1:22 ` [PATCH 5/5 V2] Btrfs-progs: add support for the compression property Filipe David Borba Manana
2013-11-13 16:15 ` [PATCH 0/5] Add support for object properties David Sterba
2013-11-23 0:52 ` David Sterba
2013-11-23 10:45 ` Goffredo Baroncelli
2014-01-07 11:51 ` Filipe David Manana
2014-01-23 17:47 ` 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=1384263706-25549-6-git-send-email-fdmanana@gmail.com \
--to=fdmanana@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).