From 35e344135ab0b584686c1bff6136ba534d78f604 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sat, 13 Sep 2008 19:54:35 -0400 Subject: [PATCH] --- yaml --- r: 112951 b: refs/heads/master c: 8eea80d52b9d87cfd771055534bd2c24f73704d7 h: refs/heads/master i: 112949: 8136def23a7a285647c330702b7f8ee5fb311186 112947: 61b53db95d3579971585403bb409455df0ec061c 112943: c503252ac49659d774192b30fcd5e1f0b1c7ba5e v: v3 --- [refs] | 2 +- trunk/fs/ext4/ext4.h | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fe7b9cbef202..bc9346ffbf0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4db46fc266b84a04b73b7a4c6ebe8a543a62a2ff +refs/heads/master: 8eea80d52b9d87cfd771055534bd2c24f73704d7 diff --git a/trunk/fs/ext4/ext4.h b/trunk/fs/ext4/ext4.h index 068adc1d5607..50a4846c7e71 100644 --- a/trunk/fs/ext4/ext4.h +++ b/trunk/fs/ext4/ext4.h @@ -291,8 +291,6 @@ struct ext4_new_group_data { #define EXT4_IOC_SETFLAGS FS_IOC_SETFLAGS #define EXT4_IOC_GETVERSION _IOR('f', 3, long) #define EXT4_IOC_SETVERSION _IOW('f', 4, long) -#define EXT4_IOC_GROUP_EXTEND _IOW('f', 7, unsigned long) -#define EXT4_IOC_GROUP_ADD _IOW('f', 8, struct ext4_new_group_input) #define EXT4_IOC_GETVERSION_OLD FS_IOC_GETVERSION #define EXT4_IOC_SETVERSION_OLD FS_IOC_SETVERSION #ifdef CONFIG_JBD2_DEBUG @@ -300,7 +298,10 @@ struct ext4_new_group_data { #endif #define EXT4_IOC_GETRSVSZ _IOR('f', 5, long) #define EXT4_IOC_SETRSVSZ _IOW('f', 6, long) -#define EXT4_IOC_MIGRATE _IO('f', 7) +#define EXT4_IOC_GROUP_EXTEND _IOW('f', 7, unsigned long) +#define EXT4_IOC_GROUP_ADD _IOW('f', 8, struct ext4_new_group_input) +#define EXT4_IOC_MIGRATE _IO('f', 9) + /* note ioctl 11 reserved for filesystem-independent FIEMAP ioctl */ /* * ioctl commands in 32 bit emulation