From: Anand Jain <anand.jain@oracle.com>
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 [thread overview]
Message-ID: <1361770289-1165-2-git-send-email-anand.jain@oracle.com> (raw)
In-Reply-To: <1361770289-1165-1-git-send-email-anand.jain@oracle.com>
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 <anand.jain@oracle.com>
---
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;
--
1.8.1.227.g44fe835
next prev parent reply other threads:[~2013-02-25 5:31 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-01 10:46 [Request for review] [RFC] Add label support for snapshots and subvols Anand jain
2012-11-01 10:46 ` [PATCH 1/2] Btrfs-progs: move open_file_or_dir() to utils.c Anand jain
2012-11-01 10:46 ` [PATCH 2/2] Btrfs-progs: add feature to label subvol and snapshot Anand jain
2012-11-01 10:46 ` [PATCH] Btrfs: add label to snapshot and subvol Anand jain
2012-11-05 7:39 ` Jan Schmidt
2012-11-16 5:15 ` Anand Jain
2012-11-01 22:16 ` [Request for review] [RFC] Add label support for snapshots and subvols cwillu
2012-11-01 22:28 ` Fajar A. Nugraha
2012-11-01 22:32 ` Hugo Mills
2012-11-01 22:49 ` Fajar A. Nugraha
2012-11-05 7:24 ` Anand Jain
2012-11-05 23:22 ` David Sterba
2012-11-01 23:04 ` Goffredo Baroncelli
2012-11-16 4:52 ` [Request for review v2] " Anand jain
2012-11-16 4:52 ` [PATCH 1/3] Btrfs-progs: move open_file_or_dir() to utils.c Anand jain
2012-11-16 4:52 ` [PATCH v2] Btrfs: add label to snapshot and subvol Anand jain
2012-11-16 6:33 ` Miao Xie
2012-11-27 18:26 ` Anand Jain
2012-11-16 4:52 ` [PATCH 2/3] Btrfs-progs: add feature to label subvol and snapshot Anand jain
2012-11-16 4:52 ` [PATCH 3/3] Btrfs-progs: cmd option to show or set the subvol label Anand jain
2012-11-27 18:29 ` [Request for review v3] [RFC] Add label support for snapshots and subvols Anand jain
2012-11-27 18:29 ` [PATCH v3] Btrfs: add label to snapshot and subvol Anand jain
2012-11-28 3:05 ` Miao Xie
2012-11-28 10:02 ` Anand Jain
2012-11-28 10:25 ` Miao Xie
2012-11-28 12:17 ` Anand Jain
2012-11-28 12:15 ` Anand jain
2012-11-27 18:29 ` [PATCH 1/3] Btrfs-progs: move open_file_or_dir() to utils.c Anand jain
2012-11-27 18:29 ` [PATCH 2/3] Btrfs-progs: add feature to label subvol and snapshot Anand jain
2012-11-27 18:29 ` [PATCH 3/3] Btrfs-progs: cmd option to show or set the subvol label Anand jain
2012-11-30 15:47 ` [PATCH 0/3] Add subvol and snapshot attribute label Anand jain
2012-11-30 15:48 ` [PATCH 1/3] Btrfs-progs: move open_file_or_dir() to utils.c Anand jain
2012-11-30 15:48 ` [PATCH 2/3] Btrfs-progs: add attribute label for subvol and snapshot Anand jain
2012-11-30 15:48 ` [PATCH 3/3] Btrfs-progs: cmd option to show or set the subvol label Anand jain
2013-02-25 5:31 ` [PATCH 0/2 v4] Btrfs-progs: Add support for " Anand Jain
2013-02-25 5:31 ` Anand Jain [this message]
2013-02-25 5:31 ` [PATCH 2/2 v4] Btrfs-progs: cmd option to show or set the " Anand Jain
2013-02-25 5:31 ` [PATCH v4] Btrfs: Add support for " Anand Jain
2013-02-25 5:31 ` [PATCH v4] Btrfs: ability to add label to snapshot and subvol Anand Jain
2013-02-25 20:45 ` Hugo Mills
2013-03-01 10:36 ` Anand Jain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1361770289-1165-2-git-send-email-anand.jain@oracle.com \
--to=anand.jain@oracle.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).