Commit 8eea80d5 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: Renumber EXT4_IOC_MIGRATE 



Pick an ioctl number for EXT4_IOC_MIGRATE that won't conflict with
other ext4 ioctl's.  Since there haven't been any major userspace
users of this ioctl, we can afford to change this now, to avoid
potential problems later.

Also, reorder the ioctl numbers in ext4.h to avoid this sort of
mistake in the future.

Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 4db46fc2

fs/ext4/ext4.h

+4 −3
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE