From: Jeff Liu <jeff.liu@oracle.com>
To: linux-btrfs@vger.kernel.org
Cc: anand.jain@oracle.com
Subject: [PATCH v4 2/3] Btrfs-progs: change the label of a mounted filesystem
Date: Wed, 12 Dec 2012 08:30:29 +0800 [thread overview]
Message-ID: <50C7D025.6050708@oracle.com> (raw)
In-Reply-To: <50C7CE36.3060603@oracle.com>
Change the label of a mounted file system through the new ioctl BTRFS_IOCTL_FS_SETLABEL.
Signed-off-by: Jie Liu <jeff.liu@oracle.com>
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
btrfslabel.c | 84 ++++++++++++++++++++++++++++++++++------------------------
ioctl.h | 2 ++
2 files changed, 51 insertions(+), 35 deletions(-)
diff --git a/btrfslabel.c b/btrfslabel.c
index 761a312..65388e5 100644
--- a/btrfslabel.c
+++ b/btrfslabel.c
@@ -46,25 +46,52 @@
#define GET_LABEL 3
#define SET_LABEL 4
-static void change_label_unmounted(char *dev, char *nLabel)
+static int set_label_unmounted(const char *dev, const char *label)
{
- struct btrfs_root *root;
- struct btrfs_trans_handle *trans;
-
- /* Open the super_block at the default location
- * and as read-write.
- */
- root = open_ctree(dev, 0, 1);
- if (!root) /* errors are printed by open_ctree() */
- return;
-
- trans = btrfs_start_transaction(root, 1);
- strncpy(root->fs_info->super_copy.label, nLabel, BTRFS_LABEL_SIZE);
- root->fs_info->super_copy.label[BTRFS_LABEL_SIZE-1] = 0;
- btrfs_commit_transaction(trans, root);
-
- /* Now we close it since we are done. */
- close_ctree(root);
+ struct btrfs_trans_handle *trans;
+ struct btrfs_root *root;
+ int ret;
+
+ ret = check_mounted(dev);
+ if (ret < 0) {
+ fprintf(stderr, "FATAL: error checking %s mount status\n", dev);
+ return -1;
+ }
+
+ /* Open the super_block at the default location
+ * and as read-write.
+ */
+ root = open_ctree(dev, 0, 1);
+ if (!root) /* errors are printed by open_ctree() */
+ return -1;
+
+ trans = btrfs_start_transaction(root, 1);
+ strncpy(root->fs_info->super_copy.label, label, BTRFS_LABEL_SIZE);
+ root->fs_info->super_copy.label[BTRFS_LABEL_SIZE-1] = 0;
+ btrfs_commit_transaction(trans, root);
+
+ /* Now we close it since we are done. */
+ close_ctree(root);
+ return 0;
+}
+
+static int set_label_mounted(const char *mount_path, const char *label)
+{
+ int fd;
+
+ fd = open(mount_path, O_RDONLY | O_NOATIME);
+ if (fd < 0) {
+ fprintf(stderr, "ERROR: unable access to '%s'\n", mount_path);
+ return -1;
+ }
+
+ if (ioctl(fd, BTRFS_IOC_SET_FSLABEL, label) < 0) {
+ fprintf(stderr, "ERROR: unable get label %s\n", strerror(errno));
+ close(fd);
+ return -1;
+ }
+
+ return 0;
}
static int get_label_unmounted(const char *dev)
@@ -125,22 +152,9 @@ int get_label(const char *btrfs_dev)
get_label_mounted(btrfs_dev);
}
-int set_label(char *btrfs_dev, char *nLabel)
+int set_label(char *btrfs_dev, char *label)
{
-
- int ret;
- ret = check_mounted(btrfs_dev);
- if (ret < 0)
- {
- fprintf(stderr, "FATAL: error checking %s mount status\n", btrfs_dev);
- return -1;
- }
-
- if(ret != 0)
- {
- fprintf(stderr, "FATAL: the filesystem has to be unmounted\n");
- return -2;
- }
- change_label_unmounted(btrfs_dev, nLabel);
- return 0;
+ return is_existing_blk_or_reg_file(btrfs_dev) ?
+ set_label_unmounted(btrfs_dev, label) :
+ set_label_mounted(btrfs_dev, label);
}
diff --git a/ioctl.h b/ioctl.h
index ed6784d..07259f9 100644
--- a/ioctl.h
+++ b/ioctl.h
@@ -434,4 +434,6 @@ struct btrfs_ioctl_clone_range_args {
struct btrfs_ioctl_qgroup_limit_args)
#define BTRFS_IOC_GET_FSLABEL _IOR(BTRFS_IOCTL_MAGIC, 53, \
char[BTRFS_LABEL_SIZE])
+#define BTRFS_IOC_SET_FSLABEL _IOW(BTRFS_IOCTL_MAGIC, 54, \
+ char[BTRFS_LABEL_SIZE])
#endif
--
1.7.9.5
next prev parent reply other threads:[~2012-12-12 0:30 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-12 0:22 [RFC PATCH V4 0/2] Btrfs: get/set mounted filesystem label support Jeff Liu
2012-12-12 0:22 ` [PATCH V4 1/2] Btrfs: Add a new ioctl to get the label of a mounted filesystem Jeff Liu
2012-12-12 0:22 ` [PATCH V4 2/2] Btrfs: Add a new ioctl to change " Jeff Liu
2012-12-12 3:03 ` Miao Xie
2012-12-12 3:17 ` Jeff Liu
2012-12-12 0:30 ` [PATCH v4 1/3] Btrfs-progs: get " Jeff Liu
2012-12-12 0:30 ` Jeff Liu [this message]
2012-12-12 0:30 ` [PATCH v4 3/3] Btrfs-progs: fix cmd_label_usage to reflect this change Jeff Liu
2012-12-12 3:22 ` [RESEND PATCH V4 1/2] Btrfs: Add a new ioctl to get the label of a mounted filesystem Jeff Liu
2012-12-12 3:50 ` Miao Xie
2012-12-12 4:01 ` Jeff Liu
2012-12-12 3:23 ` [RESEND PATCH V4 2/2] Btrfs: Add a new ioctl to change " Jeff Liu
2012-12-12 4:15 ` Miao Xie
2012-12-17 7:27 ` Jeff Liu
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=50C7D025.6050708@oracle.com \
--to=jeff.liu@oracle.com \
--cc=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).