libbtrfsutil: add btrfs_util_[gs]et_read_only()

[platform/upstream/btrfs-progs.git] / cmds-subvolume.c

diff --git a/cmds-subvolume.c b/cmds-subvolume.c
index dc626a6..8a473f7 100644 (file)
--- a/cmds-subvolume.c
+++ b/cmds-subvolume.c
@@ -210,7 +210,7 @@ static int cmd_subvol_create(int argc, char **argv)
        }
 
        if (res < 0) {
-               error("cannot create subvolume: %s", strerror(errno));
+               error("cannot create subvolume: %m");
                goto out;
        }
 
@@ -325,8 +325,7 @@ again:
        cpath = realpath(path, NULL);
        if (!cpath) {
                ret = errno;
-               error("cannot find real path for '%s': %s",
-                       path, strerror(errno));
+               error("cannot find real path for '%s': %m", path);
                goto out;
        }
        dupdname = strdup(cpath);
@@ -348,8 +347,7 @@ again:
        strncpy_null(args.name, vname);
        res = ioctl(fd, BTRFS_IOC_SNAP_DESTROY, &args);
        if(res < 0 ){
-               error("cannot delete '%s/%s': %s", dname, vname,
-                       strerror(errno));
+               error("cannot delete '%s/%s': %m", dname, vname);
                ret = 1;
                goto out;
        }
@@ -357,8 +355,7 @@ again:
        if (commit_mode == COMMIT_EACH) {
                res = wait_for_commit(fd);
                if (res < 0) {
-                       error("unable to wait for commit after '%s': %s",
-                               path, strerror(errno));
+                       error("unable to wait for commit after '%s': %m", path);
                        ret = 1;
                }
        } else if (commit_mode == COMMIT_AFTER) {
@@ -415,8 +412,8 @@ keep_fd:
                                if (res < 0) {
                                        uuid_unparse(seen->fsid, uuidbuf);
                                        error(
-                       "unable to do final sync after deletion: %s, fsid: %s",
-                                               strerror(errno), uuidbuf);
+                       "unable to do final sync after deletion: %m, fsid: %s",
+                                               uuidbuf);
                                        ret = 1;
                                } else if (verbose > 0) {
                                        uuid_unparse(seen->fsid, uuidbuf);
@@ -776,7 +773,7 @@ static int cmd_subvol_snapshot(int argc, char **argv)
        res = ioctl(fddst, BTRFS_IOC_SNAP_CREATE_V2, &args);
 
        if (res < 0) {
-               error("cannot snapshot '%s': %s", subvol, strerror(errno));
+               error("cannot snapshot '%s': %m", subvol);
                goto out;
        }
 
@@ -819,8 +816,7 @@ static int cmd_subvol_get_default(int argc, char **argv)
 
        ret = btrfs_list_get_default_subvolume(fd, &default_id);
        if (ret) {
-               error("failed to look up default subvolume: %s",
-                       strerror(errno));
+               error("failed to look up default subvolume: %m");
                goto out;
        }
 
@@ -868,7 +864,7 @@ static const char * const cmd_subvol_set_default_usage[] = {
 
 static int cmd_subvol_set_default(int argc, char **argv)
 {
-       int     ret=0, fd, e;
+       int     ret=0, fd;
        u64     objectid;
        char    *path;
        char    *subvolid;
@@ -915,11 +911,9 @@ static int cmd_subvol_set_default(int argc, char **argv)
        }
 
        ret = ioctl(fd, BTRFS_IOC_DEFAULT_SUBVOL, &objectid);
-       e = errno;
        close_file_or_dir(fd, dirstream);
        if (ret < 0) {
-               error("unable to set a new default subvolume: %s",
-                       strerror(e));
+               error("unable to set a new default subvolume: %m");
                return 1;
        }
        return 0;
@@ -963,8 +957,7 @@ static int cmd_subvol_find_new(int argc, char **argv)
 
        ret = ioctl(fd, BTRFS_IOC_SYNC);
        if (ret < 0) {
-               error("sync ioctl failed on '%s': %s",
-                       subvol, strerror(errno));
+               error("sync ioctl failed on '%s': %m", subvol);
                close_file_or_dir(fd, dirstream);
                return 1;
        }
@@ -1039,8 +1032,7 @@ static int cmd_subvol_show(int argc, char **argv)
        memset(&get_ri, 0, sizeof(get_ri));
        fullpath = realpath(argv[optind], NULL);
        if (!fullpath) {
-               error("cannot find real path for '%s': %s",
-                       argv[optind], strerror(errno));
+               error("cannot find real path for '%s': %m", argv[optind]);
                goto out;
        }