btrfs-progs: convert: Fix offset-by-one error in read_data_extent()

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

diff --git a/props.c b/props.c
index c09865b..e4edba0 100644 (file)
--- a/props.c
+++ b/props.c
@@ -17,10 +17,12 @@
 #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>
 
+#include <btrfsutil.h>
+
 #include "ctree.h"
 #include "commands.h"
 #include "utils.h"
@@ -29,63 +31,47 @@
 #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,
                          const char *name,
                          const char *value)
 {
-       int ret = 0;
-       int fd = -1;
-       u64 flags = 0;
-
-       fd = open(object, O_RDONLY);
-       if (fd < 0) {
-               ret = -errno;
-               fprintf(stderr, "ERROR: open %s failed. %s\n",
-                               object, strerror(-ret));
-               goto out;
-       }
+       enum btrfs_util_error err;
+       bool read_only;
 
-       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));
-               goto out;
-       }
-
-       if (!value) {
-               if (flags & BTRFS_SUBVOL_RDONLY)
-                       fprintf(stdout, "ro=true\n");
-               else
-                       fprintf(stdout, "ro=false\n");
-               ret = 0;
-               goto out;
-       }
+       if (value) {
+               if (!strcmp(value, "true")) {
+                       read_only = true;
+               } else if (!strcmp(value, "false")) {
+                       read_only = false;
+               } else {
+                       error("invalid value for property: %s", value);
+                       return -EINVAL;
+               }
 
-       if (!strcmp(value, "true")) {
-               flags |= BTRFS_SUBVOL_RDONLY;
-       } else if (!strcmp(value, "false")) {
-               flags = flags & ~BTRFS_SUBVOL_RDONLY;
+               err = btrfs_util_set_subvolume_read_only(object, read_only);
+               if (err) {
+                       error_btrfs_util(err);
+                       return -errno;
+               }
        } else {
-               ret = -EINVAL;
-               fprintf(stderr, "ERROR: invalid value for property.\n");
-               goto out;
-       }
+               err = btrfs_util_get_subvolume_read_only(object, &read_only);
+               if (err) {
+                       error_btrfs_util(err);
+                       return -errno;
+               }
 
-       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));
-               goto out;
+               printf("ro=%s\n", read_only ? "true" : "false");
        }
 
-out:
-       if (fd != -1)
-               close(fd);
-       return ret;
+       return 0;
 }
 
 static int prop_label(enum prop_object_type type,
@@ -119,33 +105,36 @@ 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)
+       if (value) {
+               if (strcmp(value, "no") == 0 || strcmp(value, "none") == 0)
+                       value = "";
                sret = fsetxattr(fd, xattr_name, value, strlen(value), 0);
-       else
+       } else {
                sret = fgetxattr(fd, xattr_name, NULL, 0);
+       }
        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 +150,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 +167,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 +174,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}
 };