From: Anand Jain <anand.j...@oracle.com> Signed-off-by: Anand Jain <anand.j...@oracle.com> --- btrfslabel.c | 40 ++++++++++++++++++++++++++++++++++++++++ btrfslabel.h | 4 +++- cmds-filesystem.c | 34 +++++++++++++++++++++++++++++----- ioctl.h | 2 ++ 4 files changed, 74 insertions(+), 6 deletions(-)
diff --git a/btrfslabel.c b/btrfslabel.c index cb142b0..90fe618 100644 --- a/btrfslabel.c +++ b/btrfslabel.c @@ -126,3 +126,43 @@ int set_label(char *btrfs_dev, char *nLabel) change_label_unmounted(btrfs_dev, nLabel); return 0; } + +int get_subvol_label(char *subvol) +{ + int fd, e=0; + char label[BTRFS_LABEL_SIZE+1]; + + fd = open_file_or_dir(subvol); + + if(ioctl(fd, BTRFS_IOC_SUBVOL_GETLABEL, label) < 0) { + e = errno; + fprintf(stderr, "ERROR: get subvol label failed, %s\n", + strerror(e)); + close(fd); + return -e; + } + label[BTRFS_LABEL_SIZE] = '\0'; + printf("%s\n",label); + close(fd); + return 0; +} + +int set_subvol_label(char *subvol, char *labelp) +{ + int fd, e=0; + char label[BTRFS_LABEL_SIZE]; + + fd = open_file_or_dir(subvol); + + memset(label, 0, BTRFS_LABEL_SIZE); + strcpy(label, labelp); + if(ioctl(fd, BTRFS_IOC_SUBVOL_SETLABEL, label) < 0) { + e = errno; + fprintf(stderr, "ERROR: set subvol label failed, %s\n", + strerror(e)); + close(fd); + return -e; + } + close(fd); + return 0; +} diff --git a/btrfslabel.h b/btrfslabel.h index abf43ad..3db4180 100644 --- a/btrfslabel.h +++ b/btrfslabel.h @@ -2,4 +2,6 @@ int get_label(char *btrfs_dev); -int set_label(char *btrfs_dev, char *nLabel); \ No newline at end of file +int set_label(char *btrfs_dev, char *nLabel); +int get_subvol_label(char *subvol); +int set_subvol_label(char *subvol, char *labelp); diff --git a/cmds-filesystem.c b/cmds-filesystem.c index 9c43d35..718e70b 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -22,6 +22,7 @@ #include <errno.h> #include <uuid/uuid.h> #include <ctype.h> +#include <sys/stat.h> #include "kerncompat.h" #include "ctree.h" @@ -517,18 +518,41 @@ static int cmd_resize(int argc, char **argv) } static const char * const cmd_label_usage[] = { - "btrfs filesystem label <device> [<newlabel>]", - "Get or change the label of an unmounted filesystem", - "With one argument, get the label of filesystem on <device>.", - "If <newlabel> is passed, set the filesystem label to <newlabel>.", + "btrfs filesystem label [-t] <device>|<subvol> [<newlabel>]", + "Read or modify filesystem or subvol or snapshot label", + "-t Read or modify label for the specified subvol or snapshot.", NULL }; static int cmd_label(int argc, char **argv) { - if (check_argc_min(argc, 2) || check_argc_max(argc, 3)) + struct stat st; + char subvol[BTRFS_PATH_NAME_MAX+1]; + + if (check_argc_min(argc, 2) || check_argc_max(argc, 4)) usage(cmd_label_usage); + if(getopt(argc, argv, "t:") != -1) { + if(optarg == NULL || strlen(optarg) > BTRFS_PATH_NAME_MAX) + return -1; + else { + strcpy(subvol,optarg); + if(stat(subvol, &st) < 0) { + fprintf(stderr, "Error: %s\n",strerror(errno)); + return -errno; + } + if(!S_ISDIR(st.st_mode)) { + fprintf(stderr, "Error: Not a dir\n"); + return -1; + } + } + if (argc > 3) + return set_subvol_label(argv[2], argv[3]); + else + return get_subvol_label(argv[2]); + return 0; + } + if (argc > 2) return set_label(argv[1], argv[2]); else diff --git a/ioctl.h b/ioctl.h index 6fda3a1..009fa6e 100644 --- a/ioctl.h +++ b/ioctl.h @@ -432,4 +432,6 @@ struct btrfs_ioctl_clone_range_args { struct btrfs_ioctl_qgroup_create_args) #define BTRFS_IOC_QGROUP_LIMIT _IOR(BTRFS_IOCTL_MAGIC, 43, \ struct btrfs_ioctl_qgroup_limit_args) +#define BTRFS_IOC_SUBVOL_GETLABEL _IOWR(BTRFS_IOCTL_MAGIC, 55, __u64) +#define BTRFS_IOC_SUBVOL_SETLABEL _IOW(BTRFS_IOCTL_MAGIC, 56, __u64) #endif -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html