1 ext4: Renumber EXT4_IOC_MIGRATE
3 Pick an ioctl number for EXT4_IOC_MIGRATE that won't conflict with
4 other ext4 ioctl's. Since there haven't been any major userspace
5 users of this ioctl, we can afford to change this now, to avoid
6 potential problems later.
8 Also, reorder the ioctl numbers in ext4.h to avoid this sort of
11 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
13 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
14 index 068adc1..a60d395 100644
17 @@ -291,8 +291,6 @@ struct ext4_new_group_data {
18 #define EXT4_IOC_SETFLAGS FS_IOC_SETFLAGS
19 #define EXT4_IOC_GETVERSION _IOR('f', 3, long)
20 #define EXT4_IOC_SETVERSION _IOW('f', 4, long)
21 -#define EXT4_IOC_GROUP_EXTEND _IOW('f', 7, unsigned long)
22 -#define EXT4_IOC_GROUP_ADD _IOW('f', 8, struct ext4_new_group_input)
23 #define EXT4_IOC_GETVERSION_OLD FS_IOC_GETVERSION
24 #define EXT4_IOC_SETVERSION_OLD FS_IOC_SETVERSION
25 #ifdef CONFIG_JBD2_DEBUG
26 @@ -300,7 +298,10 @@ struct ext4_new_group_data {
28 #define EXT4_IOC_GETRSVSZ _IOR('f', 5, long)
29 #define EXT4_IOC_SETRSVSZ _IOW('f', 6, long)
30 -#define EXT4_IOC_MIGRATE _IO('f', 7)
31 +#define EXT4_IOC_GROUP_EXTEND _IOW('f', 7, unsigned long)
32 +#define EXT4_IOC_GROUP_ADD _IOW('f', 8, struct ext4_new_group_input)
33 +#define EXT4_IOC_MIGRATE _IO('f', 9)
34 + /* note ioctl 11 reserved for filesystem-independent FIEMAP ioctl */
37 * ioctl commands in 32 bit emulation