From dfbc98ead8c357255909aafa7f81b3448337dde2 Mon Sep 17 00:00:00 2001 From: Mikhail Pershin Date: Thu, 19 Aug 2010 19:01:54 +0400 Subject: [PATCH] b=20334 fix conflicting ioctl numbers i=nathan i=tappro --- lustre/include/lustre/lustre_user.h | 6 +++--- lustre/include/lustre_lib.h | 14 ++++++-------- lustre/include/obd.h | 3 --- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/lustre/include/lustre/lustre_user.h b/lustre/include/lustre/lustre_user.h index 06ea33e..3731b65 100644 --- a/lustre/include/lustre/lustre_user.h +++ b/lustre/include/lustre/lustre_user.h @@ -115,6 +115,7 @@ struct obd_statfs { * *STRIPE* - set/get lov_user_md * *INFO - set/get lov_user_mds_data */ +/* see for ioctl numberss 101-150 */ #define LL_IOC_GETFLAGS _IOR ('f', 151, long) #define LL_IOC_SETFLAGS _IOW ('f', 152, long) #define LL_IOC_CLRFLAGS _IOW ('f', 153, long) @@ -132,9 +133,7 @@ struct obd_statfs { #define IOC_LOV_GETINFO _IOWR('f', 165, struct lov_user_mds_data *) #define LL_IOC_FLUSHCTX _IOW ('f', 166, long) #define LL_IOC_RMTACL _IOW ('f', 167, long) - #define LL_IOC_GETOBDCOUNT _IOR ('f', 168, long) - #define LL_IOC_LLOOP_ATTACH _IOWR('f', 169, long) #define LL_IOC_LLOOP_DETACH _IOWR('f', 170, long) #define LL_IOC_LLOOP_INFO _IOWR('f', 171, long) @@ -142,8 +141,9 @@ struct obd_statfs { #define LL_IOC_PATH2FID _IOR ('f', 173, long) #define LL_IOC_GET_CONNECT_FLAGS _IOWR('f', 174, __u64 *) #define LL_IOC_GET_MDTIDX _IOR ('f', 175, int) +#define LL_IOC_HSM_CT_START _IOW ('f', 176,struct lustre_kernelcomm) +/* see for ioctl numbers 177-210 */ -#define LL_IOC_HSM_CT_START _IOW ('f', 178, struct lustre_kernelcomm *) #define LL_STATFS_MDC 1 #define LL_STATFS_LOV 2 diff --git a/lustre/include/lustre_lib.h b/lustre/include/lustre_lib.h index e9cb2dd..37cf991 100644 --- a/lustre/include/lustre_lib.h +++ b/lustre/include/lustre_lib.h @@ -489,20 +489,18 @@ static inline void obd_ioctl_freedata(char *buf, int len) #define OBD_IOC_CHANGELOG_SEND _IOW ('f', 148, OBD_IOC_DATA_TYPE) #define OBD_IOC_GETDEVICE _IOWR ('f', 149, OBD_IOC_DATA_TYPE) #define OBD_IOC_FID2PATH _IOWR ('f', 150, OBD_IOC_DATA_TYPE) -#define OBD_IOC_CHANGELOG_REG _IOW ('f', 151, OBD_IOC_DATA_TYPE) -#define OBD_IOC_CHANGELOG_DEREG _IOW ('f', 152, OBD_IOC_DATA_TYPE) -#define OBD_IOC_CHANGELOG_CLEAR _IOW ('f', 153, OBD_IOC_DATA_TYPE) - +/* see for ioctls 151-153 */ #define OBD_IOC_LOV_SETSTRIPE _IOW ('f', 154, OBD_IOC_DATA_TYPE) #define OBD_IOC_LOV_GETSTRIPE _IOW ('f', 155, OBD_IOC_DATA_TYPE) #define OBD_IOC_LOV_SETEA _IOW ('f', 156, OBD_IOC_DATA_TYPE) - +/* see for ioctls 157-159 */ #define OBD_IOC_QUOTACHECK _IOW ('f', 160, int) #define OBD_IOC_POLL_QUOTACHECK _IOR ('f', 161, struct if_quotacheck *) #define OBD_IOC_QUOTACTL _IOWR('f', 162, struct if_quotactl *) - -#define OBD_IOC_MOUNTOPT _IOWR('f', 170, OBD_IOC_DATA_TYPE) - +/* see for ioctls 163-175 */ +#define OBD_IOC_CHANGELOG_REG _IOW ('f', 177, struct obd_ioctl_data) +#define OBD_IOC_CHANGELOG_DEREG _IOW ('f', 178, struct obd_ioctl_data) +#define OBD_IOC_CHANGELOG_CLEAR _IOW ('f', 179, struct obd_ioctl_data) #define OBD_IOC_RECORD _IOWR('f', 180, OBD_IOC_DATA_TYPE) #define OBD_IOC_ENDRECORD _IOWR('f', 181, OBD_IOC_DATA_TYPE) #define OBD_IOC_PARSE _IOWR('f', 182, OBD_IOC_DATA_TYPE) diff --git a/lustre/include/obd.h b/lustre/include/obd.h index 32e35be..bb56150 100644 --- a/lustre/include/obd.h +++ b/lustre/include/obd.h @@ -54,9 +54,6 @@ #define IOC_MDC_TYPE 'i' #define IOC_MDC_MIN_NR 20 -/* Moved to lustre_user.h -#define IOC_MDC_LOOKUP _IOWR(IOC_MDC_TYPE, 20, struct obd_ioctl_data *) -#define IOC_MDC_GETSTRIPE _IOWR(IOC_MDC_TYPE, 21, struct lov_mds_md *) */ #define IOC_MDC_MAX_NR 50 #include -- 1.8.3.1