From patchwork Mon Feb 25 05:31:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 2180211 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 71ADDDFE86 for ; Mon, 25 Feb 2013 05:31:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755004Ab3BYFbi (ORCPT ); Mon, 25 Feb 2013 00:31:38 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:31841 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753276Ab3BYFbg (ORCPT ); Mon, 25 Feb 2013 00:31:36 -0500 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r1P5VZRd005496 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 25 Feb 2013 05:31:36 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r1P5VZ6t009387 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 25 Feb 2013 05:31:35 GMT Received: from abhmt118.oracle.com (abhmt118.oracle.com [141.146.116.70]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id r1P5VYBW014951 for ; Sun, 24 Feb 2013 23:31:34 -0600 Received: from wish.sg.oracle.com (/10.186.101.18) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sun, 24 Feb 2013 21:31:34 -0800 From: Anand Jain To: linux-btrfs@vger.kernel.org Subject: [PATCH 1/2 v4] Btrfs-progs: add feature to label subvol and snapshot Date: Mon, 25 Feb 2013 13:31:28 +0800 Message-Id: <1361770289-1165-2-git-send-email-anand.jain@oracle.com> X-Mailer: git-send-email 1.8.1.164.g2d0029e In-Reply-To: <1361770289-1165-1-git-send-email-anand.jain@oracle.com> References: <1351766770-4044-1-git-send-email-Anand.Jain@oracle.com> <1361770289-1165-1-git-send-email-anand.jain@oracle.com> X-Source-IP: acsinet22.oracle.com [141.146.126.238] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org btrfs-progs framework to add support to label the subvol and snapshots. This patch is for the ioctl-way to write label to the subvol and snapshot. (the other way is to use attribute if then only this patch has to be backed out in btrfs-progs and replace with the patch titled Btrfs-progs: add attribute label for subvol and snapshot) Signed-off-by: Anand Jain --- btrfslabel.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ btrfslabel.h | 4 +++- ctree.h | 4 +++- ioctl.h | 2 ++ print-tree.c | 2 ++ 5 files changed, 55 insertions(+), 2 deletions(-) diff --git a/btrfslabel.c b/btrfslabel.c index a421a8b..b3ad540 100644 --- a/btrfslabel.c +++ b/btrfslabel.c @@ -126,3 +126,48 @@ int set_label(char *btrfs_dev, char *nLabel) } return change_label_unmounted(btrfs_dev, nLabel); } + +int get_subvol_label(char *subvol, char *labelp) +{ + int fd, e=0; + + fd = open_file_or_dir(subvol); + + if(ioctl(fd, BTRFS_IOC_SUBVOL_GETLABEL, labelp) < 0) { + e = errno; + fprintf(stderr, "ERROR: get subvol label failed, %s\n", + strerror(e)); + close(fd); + return -e; + } + labelp[BTRFS_LABEL_SIZE] = '\0'; + if (!strlen(labelp)) + return -1; + close(fd); + return 0; +} + +int set_subvol_label(char *subvol, char *labelp) +{ + int fd, e=0; + char label[BTRFS_SUBVOL_LABEL_SIZE+1]; + + if (strlen(labelp) > BTRFS_SUBVOL_LABEL_SIZE) { + fprintf(stderr, "ERROR: Subvol label is more than max length %d\n", + BTRFS_SUBVOL_LABEL_SIZE); + return -1; + } + memset(label, 0, BTRFS_SUBVOL_LABEL_SIZE+1); + strcpy(label, labelp); + fd = open_file_or_dir(subvol); + + 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..1abc483 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, char *labelp); +int set_subvol_label(char *subvol, char *labelp); diff --git a/ctree.h b/ctree.h index 12f8fe3..bacb7d1 100644 --- a/ctree.h +++ b/ctree.h @@ -332,6 +332,7 @@ struct btrfs_header { */ #define BTRFS_SYSTEM_CHUNK_ARRAY_SIZE 2048 #define BTRFS_LABEL_SIZE 256 +#define BTRFS_SUBVOL_LABEL_SIZE 32 /* * just in case we somehow lose the roots and are not able to mount, @@ -721,7 +722,8 @@ struct btrfs_root_item { struct btrfs_timespec otime; struct btrfs_timespec stime; struct btrfs_timespec rtime; - __le64 reserved[8]; /* for future */ + char label[BTRFS_SUBVOL_LABEL_SIZE]; + __le64 reserved[4]; /* for future */ } __attribute__ ((__packed__)); /* diff --git a/ioctl.h b/ioctl.h index 3e7e451..4cbae3a 100644 --- a/ioctl.h +++ b/ioctl.h @@ -524,6 +524,8 @@ struct btrfs_ioctl_clone_range_args { struct btrfs_ioctl_get_dev_stats) #define BTRFS_IOC_DEV_REPLACE _IOWR(BTRFS_IOCTL_MAGIC, 53, \ struct btrfs_ioctl_dev_replace_args) +#define BTRFS_IOC_SUBVOL_GETLABEL _IOWR(BTRFS_IOCTL_MAGIC, 55, __u64) +#define BTRFS_IOC_SUBVOL_SETLABEL _IOW(BTRFS_IOCTL_MAGIC, 56, __u64) #ifdef __cplusplus } diff --git a/print-tree.c b/print-tree.c index c9e891b..3d097dd 100644 --- a/print-tree.c +++ b/print-tree.c @@ -366,6 +366,8 @@ static void print_root(struct extent_buffer *leaf, int slot) btrfs_root_stransid(&root_item), btrfs_root_rtransid(&root_item)); } + if (strlen(root_item.label)) + printf("\t\tlabel %s\n", root_item.label); } if (btrfs_root_refs(&root_item) == 0) { struct btrfs_key drop_key;