| Message ID | f85225cc3f232fda01c71c5c1afee0139a8ee5ef.1455801904.git.dsterba@suse.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On 02/18/2016 09:25 PM, David Sterba wrote: > The control device is accessible when no filesystem is mounted and we > may want to query features supported by the module. yes. > This is already > possible using the sysfs files, this ioctl is for parity and > convenience. Reviewed-by: Anand Jain <anand.jain@oracle.com> Thanks. > Signed-off-by: David Sterba <dsterba@suse.com> > --- > fs/btrfs/ctree.h | 1 + > fs/btrfs/ioctl.c | 3 +-- > fs/btrfs/super.c | 4 ++++ > 3 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h > index bfe4a337fb4d..47bc50fd4f55 100644 > --- a/fs/btrfs/ctree.h > +++ b/fs/btrfs/ctree.h > @@ -4089,6 +4089,7 @@ void btrfs_test_inode_set_ops(struct inode *inode); > > /* ioctl.c */ > long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg); > +int btrfs_ioctl_get_supported_features(struct file *file, void __user *arg); > void btrfs_update_iflags(struct inode *inode); > void btrfs_inherit_iflags(struct inode *inode, struct inode *dir); > int btrfs_is_empty_uuid(u8 *uuid); > diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c > index 952172ca7e45..f4c6ed5c5300 100644 > --- a/fs/btrfs/ioctl.c > +++ b/fs/btrfs/ioctl.c > @@ -5187,8 +5187,7 @@ static int btrfs_ioctl_set_fslabel(struct file *file, void __user *arg) > .compat_ro_flags = BTRFS_FEATURE_COMPAT_RO_##suffix, \ > .incompat_flags = BTRFS_FEATURE_INCOMPAT_##suffix } > > -static int btrfs_ioctl_get_supported_features(struct file *file, > - void __user *arg) > +int btrfs_ioctl_get_supported_features(struct file *file, void __user *arg) > { > static const struct btrfs_ioctl_feature_flags features[3] = { > INIT_FEATURE_FLAGS(SUPP), > diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c > index d41e09fe8e38..dda6f64dfd73 100644 > --- a/fs/btrfs/super.c > +++ b/fs/btrfs/super.c > @@ -2163,6 +2163,10 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd, > break; > ret = !(fs_devices->num_devices == fs_devices->total_devices); > break; > + case BTRFS_IOC_GET_SUPPORTED_FEATURES: > + ret = btrfs_ioctl_get_supported_features(NULL, > + (void __user*)arg); > + break; > } > > kfree(vol); > -- 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
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index bfe4a337fb4d..47bc50fd4f55 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -4089,6 +4089,7 @@ void btrfs_test_inode_set_ops(struct inode *inode); /* ioctl.c */ long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg); +int btrfs_ioctl_get_supported_features(struct file *file, void __user *arg); void btrfs_update_iflags(struct inode *inode); void btrfs_inherit_iflags(struct inode *inode, struct inode *dir); int btrfs_is_empty_uuid(u8 *uuid); diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 952172ca7e45..f4c6ed5c5300 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -5187,8 +5187,7 @@ static int btrfs_ioctl_set_fslabel(struct file *file, void __user *arg) .compat_ro_flags = BTRFS_FEATURE_COMPAT_RO_##suffix, \ .incompat_flags = BTRFS_FEATURE_INCOMPAT_##suffix } -static int btrfs_ioctl_get_supported_features(struct file *file, - void __user *arg) +int btrfs_ioctl_get_supported_features(struct file *file, void __user *arg) { static const struct btrfs_ioctl_feature_flags features[3] = { INIT_FEATURE_FLAGS(SUPP), diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index d41e09fe8e38..dda6f64dfd73 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -2163,6 +2163,10 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd, break; ret = !(fs_devices->num_devices == fs_devices->total_devices); break; + case BTRFS_IOC_GET_SUPPORTED_FEATURES: + ret = btrfs_ioctl_get_supported_features(NULL, + (void __user*)arg); + break; } kfree(vol);
The control device is accessible when no filesystem is mounted and we may want to query features supported by the module. This is already possible using the sysfs files, this ioctl is for parity and convenience. Signed-off-by: David Sterba <dsterba@suse.com> --- fs/btrfs/ctree.h | 1 + fs/btrfs/ioctl.c | 3 +-- fs/btrfs/super.c | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-)