Btrfs: use BTRFS_VOL_NAME_MAX for struct btrfs_ioctl_vol_args
PATCH 1/1 Btrfs: use BTRFS_VOL_NAME_MAX for struct btrfs_ioctl_vol_args
I found userspace tool, btrfsctl, uses BTRFS_VOL_NAME_MAX, and it also looks that this one is more proper.
Kill BTRFS_PATH_NAME_MAX since no one will use it.
---
fs/btrfs/ioctl.c +4 -4
@@ -472,7 +472,7 @@ static int btrfs_ioctl_resize(struct btrfs_root *root, void __user *arg) goto out; } - vol_args->name[BTRFS_PATH_NAME_MAX ] ='\0' ; + vol_args->name[BTRFS_VOL_NAME_MAX ] ='\0' ; namelen =strlen (vol_args->name);mutex_lock (&root->fs_info->volume_mutex);
@@ -576,7 +576,7 @@ static noinline int btrfs_ioctl_snap_create(struct file *file, goto out; } - vol_args->name[BTRFS_PATH_NAME_MAX ] ='\0' ; + vol_args->name[BTRFS_VOL_NAME_MAX ] ='\0' ; namelen =strlen (vol_args->name);if (strchr (vol_args->name,'/' )) { ret = -EINVAL ;
@@ -685,7 +685,7 @@ static long btrfs_ioctl_add_dev(struct btrfs_root *root, void __user *arg) ret = -EFAULT ; goto out; } - vol_args->name[BTRFS_PATH_NAME_MAX ] ='\0' ; + vol_args->name[BTRFS_VOL_NAME_MAX ] ='\0' ; ret =btrfs_init_new_device (root, vol_args->name); out:
@@ -713,7 +713,7 @@ static long btrfs_ioctl_rm_dev(struct btrfs_root *root, void __user *arg) ret = -EFAULT ; goto out; } - vol_args->name[BTRFS_PATH_NAME_MAX ] ='\0' ; + vol_args->name[BTRFS_VOL_NAME_MAX ] ='\0' ; ret =btrfs_rm_device (root, vol_args->name); out:
fs/btrfs/ioctl.h +1 -3
@@ -22,12 +22,10 @@#define BTRFS_IOCTL_MAGIC 0x94#define BTRFS_VOL_NAME_MAX 255 -#define BTRFS_PATH_NAME_MAX 4087 -/* this should be 4k */ struct btrfs_ioctl_vol_args {__s64 fd; -char name[BTRFS_PATH_NAME_MAX +1 ]; +char name[BTRFS_VOL_NAME_MAX +1 ]; };struct btrfs_ioctl_clone_range_args {
fs/btrfs/super.c +1 -1
@@ -593,7 +593,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd, ret = -EFAULT ; goto out; } - len =strnlen (vol->name,BTRFS_PATH_NAME_MAX ); + len =strnlen (vol->name,BTRFS_VOL_NAME_MAX );switch (cmd) {case BTRFS_IOC_SCAN_DEV :
Quoted 6 lines · On Mon, Jan 19, 2009 at 08:57:32PM +0800, Am=E9rico Wang wrote:
=20
I found userspace tool, btrfsctl, usesBTRFS_VOL_NAME_MAX, and it also looks that this one is more proper.
=20
KillBTRFS_PATH_NAME_MAXsince no one will use it. =20
Nope, BTRFS_PATH_NAME_MAX is specifically used for the ioctl stuff, mak= es the
arguments 4k aligned, this patch is incorrect. Thanks,
Josef
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" = in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 9 lines · Josef Bacik
Quoted 6 lines · On Mon, Jan 19, 2009 at 08:57:32PM +0800, Am=C3=A9rico Wang wrote:
=20
I found userspace tool, btrfsctl, usesBTRFS_VOL_NAME_MAX, and it also looks that this one is more proper.
=20
KillBTRFS_PATH_NAME_MAXsince no one will use it. =20Nope,
BTRFS_PATH_NAME_MAXis specifically used for the ioctl stuff, ma=
kes the
Quoted 1 line
arguments 4k aligned, this patch is incorrect. Thanks,
Ok, then what is BTRFS_VOL_NAME_MAX? :)
--=20
"Against stupidity, the gods themselves, contend in vain."
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" = in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 10 lines · On Mon, 2009-01-19 at 21:12 +0800, Am=C3=A9rico Wang wrote:
Quoted 9 lines · Josef Bacik
Quoted 6 lines · On Mon, Jan 19, 2009 at 08:57:32PM +0800, Am=C3=A9rico Wang wrote:
=20
I found userspace tool, btrfsctl, usesBTRFS_VOL_NAME_MAX, and it also looks that this one is more proper.
=20
KillBTRFS_PATH_NAME_MAXsince no one will use it. =20Nope,
BTRFS_PATH_NAME_MAXis specifically used for the ioctl stuff, =
makes the
Quoted 3 lines
Quoted 1 line
arguments 4k aligned, this patch is incorrect. Thanks,
=20
Ok, then what isBTRFS_VOL_NAME_MAX? :)
Right now it is only used in the progs. The disk format doesn't really have a max there, it is just to keep names usable. But, we should add = a
check in the kernel ioctl side, are you interested in sending a patch for it?
-chris
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" = in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 11 lines · Chris Mason
Quoted 10 lines · On Mon, 2009-01-19 at 21:12 +0800, Am=C3=A9rico Wang wrote:
Quoted 9 lines · Josef Bacik
Quoted 6 lines · On Mon, Jan 19, 2009 at 08:57:32PM +0800, Am=C3=A9rico Wang wrote:
=20
I found userspace tool, btrfsctl, usesBTRFS_VOL_NAME_MAX, and it also looks that this one is more proper.
=20
KillBTRFS_PATH_NAME_MAXsince no one will use it. =20Nope,
BTRFS_PATH_NAME_MAXis specifically used for the ioctl stuff,=
makes the
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
arguments 4k aligned, this patch is incorrect. Thanks,
=20
Ok, then what isBTRFS_VOL_NAME_MAX? :)Right now it is only used in the progs. The disk format doesn't reall=
y
Quoted 1 line
have a max there, it is just to keep names usable. But, we should add=
a
Quoted 3 lines
check in the kernel ioctl side, are you interested in sending a patch for it?
Yup, I will do.
Thanks.
--=20
"Against stupidity, the gods themselves, contend in vain."
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" = in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html