From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from acsinet15.oracle.com ([141.146.126.227]:21823 "EHLO acsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751187Ab2H3Fmm (ORCPT ); Thu, 30 Aug 2012 01:42:42 -0400 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by acsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q7U5gdC4029659 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 30 Aug 2012 05:42:40 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q7U5gcXm007448 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 30 Aug 2012 05:42:39 GMT Received: from abhmt110.oracle.com (abhmt110.oracle.com [141.146.116.62]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q7U5gcYr004061 for ; Thu, 30 Aug 2012 00:42:38 -0500 Message-ID: <503EFDBA.8030707@oracle.com> Date: Thu, 30 Aug 2012 13:44:26 +0800 From: Anand Jain MIME-Version: 1.0 To: Jie Liu CC: linux-btrfs@vger.kernel.org Subject: Re: [PATCH] Btrfs: Add get/set label ioctl References: <1346229961-635-1-git-send-email-Anand.Jain@oracle.com> <503DDA25.1020407@oracle.com> <503EC7F0.2020305@oracle.com> In-Reply-To: <503EC7F0.2020305@oracle.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Sender: linux-btrfs-owner@vger.kernel.org List-ID: Jeff, I don't find the get label ioctl part unless I am missing something. Any idea? Thxs, -Anand On 30/08/12 09:54, Anand Jain wrote: > > Ah. I missed that. Thanks. > So should use your original patch. > > -Anand > > On 29/08/12 17:00, Jie Liu wrote: >> Hi Anand, >> >> I have posted a patch for set label back to last year, which can be >> found at: >> https://patchwork.kernel.org/patch/1124642/ >> >> Besides that, we have discussed to use 50 as the ioctl(2) number at >> that time. >> >> task assignment in our wiki page: >> https://btrfs.wiki.kernel.org/index.php/Project_ideas#Set.2Fchange_file_system_label >> >> Thanks, >> -Jeff >> >> On 08/29/12 16:46, Anand jain wrote: >>> From: Anand Jain >>> >>> Signed-off-by: Anand Jain >>> --- >>> fs/btrfs/ctree.h | 10 ++++++++++ >>> fs/btrfs/ioctl.c | 30 ++++++++++++++++++++++++++++++ >>> fs/btrfs/ioctl.h | 2 ++ >>> 3 files changed, 42 insertions(+), 0 deletions(-) >>> >>> diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h >>> index 4bab807..eff506f 100644 >>> --- a/fs/btrfs/ctree.h >>> +++ b/fs/btrfs/ctree.h >>> @@ -2583,6 +2583,16 @@ BTRFS_SETGET_STACK_FUNCS(super_csum_type, struct btrfs_super_block, >>> BTRFS_SETGET_STACK_FUNCS(super_cache_generation, struct btrfs_super_block, >>> cache_generation, 64); >>> >>> +static inline char * btrfs_super_label(struct btrfs_super_block *s) >>> +{ >>> + return s->label; >>> +} >>> +static inline void btrfs_set_super_label(struct btrfs_super_block *s, >>> + char *val) >>> +{ >>> + memcpy(s->label,val,BTRFS_LABEL_SIZE); >>> +} >>> + >>> static inline int btrfs_super_csum_size(struct btrfs_super_block *s) >>> { >>> int t = btrfs_super_csum_type(s); >>> diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c >>> index 7bb7556..b472942 100644 >>> --- a/fs/btrfs/ioctl.c >>> +++ b/fs/btrfs/ioctl.c >>> @@ -3687,6 +3687,32 @@ out: >>> return ret; >>> } >>> >>> +static int btrfs_ioctl_get_label(struct btrfs_root *root, void __user *arg) >>> +{ >>> + char *label; >>> + label = btrfs_super_label(root->fs_info->super_copy); >>> + if (copy_to_user(arg, label, BTRFS_LABEL_SIZE)) >>> + return -EFAULT; >>> + return 0; >>> +} >>> + >>> +static int btrfs_ioctl_set_label(struct btrfs_root *root, void __user *arg) >>> +{ >>> + struct btrfs_trans_handle *trans; >>> + char label[BTRFS_LABEL_SIZE+1]; >>> + >>> + if (!capable(CAP_SYS_ADMIN)) >>> + return -EPERM; >>> + if (copy_from_user(label, arg, BTRFS_LABEL_SIZE)) >>> + return -EFAULT; >>> + label[BTRFS_LABEL_SIZE] = '\0'; >>> + trans = btrfs_start_transaction(root, 1); >>> + btrfs_set_super_label(root->fs_info->super_copy, label); >>> + btrfs_commit_transaction(trans, root); >>> + >>> + return 0; >>> +} >>> + >>> long btrfs_ioctl(struct file *file, unsigned int >>> cmd, unsigned long arg) >>> { >>> @@ -3785,6 +3811,10 @@ long btrfs_ioctl(struct file *file, unsigned int >>> return btrfs_ioctl_qgroup_create(root, argp); >>> case BTRFS_IOC_QGROUP_LIMIT: >>> return btrfs_ioctl_qgroup_limit(root, argp); >>> + case BTRFS_IOC_GET_LABEL: >>> + return btrfs_ioctl_get_label(root, argp); >>> + case BTRFS_IOC_SET_LABEL: >>> + return btrfs_ioctl_set_label(root, argp); >>> } >>> >>> return -ENOTTY; >>> diff --git a/fs/btrfs/ioctl.h b/fs/btrfs/ioctl.h >>> index 731e287..0c60fcb 100644 >>> --- a/fs/btrfs/ioctl.h >>> +++ b/fs/btrfs/ioctl.h >>> @@ -453,4 +453,6 @@ struct btrfs_ioctl_send_args { >>> struct btrfs_ioctl_qgroup_limit_args) >>> #define BTRFS_IOC_GET_DEV_STATS _IOWR(BTRFS_IOCTL_MAGIC, 52, \ >>> struct btrfs_ioctl_get_dev_stats) >>> +#define BTRFS_IOC_GET_LABEL _IOR(BTRFS_IOCTL_MAGIC, 53, __u64) >>> +#define BTRFS_IOC_SET_LABEL _IOW(BTRFS_IOCTL_MAGIC, 54, __u64) >>> #endif >> >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html > -- > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html