btrfs-progs: add OPEN_CTREE_INVALIDATE_FST flag

[platform/upstream/btrfs-progs.git] / props.c

diff --git a/props.c b/props.c
index c09865b..a7e3e96 100644 (file)
--- a/props.c
+++ b/props.c
@@ -17,7 +17,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include <fcntl.h>
 #include <unistd.h>
 
@@ -29,6 +29,12 @@
 #define XATTR_BTRFS_PREFIX     "btrfs."
 #define XATTR_BTRFS_PREFIX_LEN (sizeof(XATTR_BTRFS_PREFIX) - 1)
 
+/*
+ * Defined as synonyms in attr/xattr.h
+ */
+#ifndef ENOATTR
+#define ENOATTR ENODATA
+#endif
 
 static int prop_read_only(enum prop_object_type type,
                          const char *object,
@@ -42,16 +48,15 @@ static int prop_read_only(enum prop_object_type type,
        fd = open(object, O_RDONLY);
        if (fd < 0) {
                ret = -errno;
-               fprintf(stderr, "ERROR: open %s failed. %s\n",
-                               object, strerror(-ret));
+               error("failed to open %s: %s", object, strerror(-ret));
                goto out;
        }
 
        ret = ioctl(fd, BTRFS_IOC_SUBVOL_GETFLAGS, &flags);
        if (ret < 0) {
                ret = -errno;
-               fprintf(stderr, "ERROR: failed to get flags for %s. %s\n",
-                               object, strerror(-ret));
+               error("failed to get flags for %s: %s", object,
+                               strerror(-ret));
                goto out;
        }
 
@@ -70,15 +75,15 @@ static int prop_read_only(enum prop_object_type type,
                flags = flags & ~BTRFS_SUBVOL_RDONLY;
        } else {
                ret = -EINVAL;
-               fprintf(stderr, "ERROR: invalid value for property.\n");
+               error("invalid value for property: %s", value);
                goto out;
        }
 
        ret = ioctl(fd, BTRFS_IOC_SUBVOL_SETFLAGS, &flags);
        if (ret < 0) {
                ret = -errno;
-               fprintf(stderr, "ERROR: failed to set flags for %s. %s\n",
-                               object, strerror(-ret));
+               error("failed to set flags for %s: %s", object,
+                               strerror(-ret));
                goto out;
        }
 
@@ -119,22 +124,23 @@ static int prop_compression(enum prop_object_type type,
        DIR *dirstream = NULL;
        char *buf = NULL;
        char *xattr_name = NULL;
+       int open_flags = value ? O_RDWR : O_RDONLY;
 
-       fd = open_file_or_dir(object, &dirstream);
+       fd = open_file_or_dir3(object, &dirstream, open_flags);
        if (fd == -1) {
                ret = -errno;
-               fprintf(stderr, "ERROR: open %s failed. %s\n",
-                       object, strerror(-ret));
+               error("failed to open %s: %s", object, strerror(-ret));
                goto out;
        }
 
-       xattr_name = malloc(XATTR_BTRFS_PREFIX_LEN + strlen(name));
+       xattr_name = malloc(XATTR_BTRFS_PREFIX_LEN + strlen(name) + 1);
        if (!xattr_name) {
                ret = -ENOMEM;
                goto out;
        }
        memcpy(xattr_name, XATTR_BTRFS_PREFIX, XATTR_BTRFS_PREFIX_LEN);
        memcpy(xattr_name + XATTR_BTRFS_PREFIX_LEN, name, strlen(name));
+       xattr_name[XATTR_BTRFS_PREFIX_LEN + strlen(name)] = '\0';
 
        if (value)
                sret = fsetxattr(fd, xattr_name, value, strlen(value), 0);
@@ -143,9 +149,8 @@ static int prop_compression(enum prop_object_type type,
        if (sret < 0) {
                ret = -errno;
                if (ret != -ENOATTR)
-                       fprintf(stderr,
-                               "ERROR: failed to %s compression for %s. %s\n",
-                               value ? "set" : "get", object, strerror(-ret));
+                       error("failed to %s compression for %s: %s",
+                             value ? "set" : "get", object, strerror(-ret));
                else
                        ret = 0;
                goto out;
@@ -161,9 +166,8 @@ static int prop_compression(enum prop_object_type type,
                sret = fgetxattr(fd, xattr_name, buf, len);
                if (sret < 0) {
                        ret = -errno;
-                       fprintf(stderr,
-                               "ERROR: failed to get compression for %s. %s\n",
-                               object, strerror(-ret));
+                       error("failed to get compression for %s: %s",
+                             object, strerror(-ret));
                        goto out;
                }
                fprintf(stdout, "compression=%.*s\n", (int)len, buf);
@@ -179,7 +183,6 @@ out:
        return ret;
 }
 
-
 const struct prop_handler prop_handlers[] = {
        {"ro", "Set/get read-only flag of subvolume.", 0, prop_object_subvol,
         prop_read_only},
@@ -187,5 +190,5 @@ const struct prop_handler prop_handlers[] = {
         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}
+       {NULL, NULL, 0, 0, NULL}
 };