From: Miao Xie <miaox@cn.fujitsu.com>
To: Jeff Liu <jeff.liu@oracle.com>
Cc: linux-btrfs@vger.kernel.org, anand.jain@oracle.com
Subject: Re: [RFC PATCH V5 2/2] Btrfs: Add a new ioctl to change the label of a mounted file system
Date: Mon, 17 Dec 2012 19:57:28 +0800 [thread overview]
Message-ID: <50CF08A8.9010504@cn.fujitsu.com> (raw)
In-Reply-To: <50CF0063.3060503@oracle.com>
On mon, 17 Dec 2012 19:22:11 +0800, Jeff Liu wrote:
> Introduce a new ioctl BTRFS_IOC_SET_FSLABEL to change the label of a mounted file system.
>
> Signed-off-by: Jie Liu <jeff.liu@oracle.com>
> Signed-off-by: Anand Jain <anand.jain@oracle.com>
> Cc: Miao Xie <miaox@cn.fujitsu.com>
>
> ---
> fs/btrfs/ioctl.c | 40 ++++++++++++++++++++++++++++++++++++++++
> fs/btrfs/ioctl.h | 2 ++
> 2 files changed, 42 insertions(+)
>
> diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
> index 6a2488a..0186651 100644
> --- a/fs/btrfs/ioctl.c
> +++ b/fs/btrfs/ioctl.c
> @@ -3712,6 +3712,44 @@ static int btrfs_ioctl_get_fslabel(struct file *file, void __user *arg)
> return ret ? -EFAULT : 0;
> }
>
> +static int btrfs_ioctl_set_fslabel(struct file *file, void __user *arg)
> +{
> + struct btrfs_root *root = BTRFS_I(fdentry(file)->d_inode)->root;
> + struct btrfs_super_block *super_block = root->fs_info->super_copy;
> + char label[BTRFS_LABEL_SIZE];
> + int ret;
> +
> + if (!capable(CAP_SYS_ADMIN))
> + return -EPERM;
> +
> + if (copy_from_user(label, arg, sizeof(label)))
> + return -EFAULT;
> +
> + if (strlen(label) > BTRFS_LABEL_SIZE - 1)
> + return -EINVAL;
I think we should use strnlen()
Thanks
Miao
> +
> + ret = mnt_want_write_file(file);
> + if (ret)
> + return ret;
> +
> + mutex_lock(&root->fs_info->volume_mutex);
> + trans = btrfs_start_transaction(root, 1);
> + if (IS_ERR(trans)) {
> + ret = PTR_ERR(trans);
> + goto out_unlock;
> + }
> +
> + label[BTRFS_LABEL_SIZE - 1] = '\0';
> + strcpy(super_block->label, label);
> + btrfs_end_transaction(trans, root);
> +
> +out_unlock:
> + mutex_unlock(&root->fs_info->volume_mutex);
> + mnt_drop_write_file(file);
> + return ret;
> +}
> +
> long btrfs_ioctl(struct file *file, unsigned int
> cmd, unsigned long arg)
> {
> @@ -3812,6 +3850,8 @@ long btrfs_ioctl(struct file *file, unsigned int
> return btrfs_ioctl_qgroup_limit(root, argp);
> case BTRFS_IOC_GET_FSLABEL:
> return btrfs_ioctl_get_fslabel(file, argp);
> + case BTRFS_IOC_SET_FSLABEL:
> + return btrfs_ioctl_set_fslabel(file, argp);
> }
>
> return -ENOTTY;
> diff --git a/fs/btrfs/ioctl.h b/fs/btrfs/ioctl.h
> index 5b2cbef..2abe239 100644
> --- a/fs/btrfs/ioctl.h
> +++ b/fs/btrfs/ioctl.h
> @@ -453,6 +453,8 @@ struct btrfs_ioctl_send_args {
> struct btrfs_ioctl_qgroup_limit_args)
> #define BTRFS_IOC_GET_FSLABEL _IOR(BTRFS_IOCTL_MAGIC, 49, \
> char[BTRFS_LABEL_SIZE])
> +#define BTRFS_IOC_SET_FSLABEL _IOW(BTRFS_IOCTL_MAGIC, 50, \
> + char[BTRFS_LABEL_SIZE])
> #define BTRFS_IOC_GET_DEV_STATS _IOWR(BTRFS_IOCTL_MAGIC, 52, \
> struct btrfs_ioctl_get_dev_stats)
> #endif
>
next prev parent reply other threads:[~2012-12-17 11:57 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-17 11:21 [RFC PATCH V5 0/2] Btrfs: get/set label of mounted file system Jeff Liu
2012-12-17 11:22 ` [RFC PATCH V5 1/2] Btrfs: Add a new ioctl to get the label of a mounted filesystem Jeff Liu
2012-12-17 11:59 ` Miao Xie
2012-12-17 11:22 ` [RFC PATCH V5 2/2] Btrfs: Add a new ioctl to change the label of a mounted file system Jeff Liu
2012-12-17 11:57 ` Miao Xie [this message]
2012-12-17 13:30 ` Jeff Liu
2012-12-17 17:34 ` Goffredo Baroncelli
2012-12-18 2:20 ` Jeff Liu
2012-12-18 2:21 ` Miao Xie
2012-12-18 2:33 ` Jeff Liu
2012-12-18 2:47 ` Jeff Liu
2012-12-17 11:34 ` [PATCH v5 1/4] Btrfs-progs: get " Jeff Liu
2012-12-17 11:35 ` [PATCH V5 2/4] Btrfs-progs: Change the " Jeff Liu
2012-12-17 11:35 ` [PATCH V5 3/4] Btrfs-progs: Fix set_label_unmounted() with label length validation Jeff Liu
2012-12-17 11:35 ` [PATCH v5 4/4] Btrfs-progs: fix cmd_label_usage to reflect this change 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=50CF08A8.9010504@cn.fujitsu.com \
--to=miaox@cn.fujitsu.com \
--cc=anand.jain@oracle.com \
--cc=jeff.liu@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).