LU-6202 misc: remove LIBCFS_IOC_DEBUG_MASK ioctl

Remove the LIBCFS_IOC_DEBUG_MASK ioctl, since the debug and subsystem
mask can be modified via /proc for a long time, and tools have not
used this ioctl since 2.6.

Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: Idfcf85b2d4317bb4baac7ee9af55158f7b3ebbe5
Reviewed-on: https://review.whamcloud.com/33692
Reviewed-by: Patrick Farrell <paf@cray.com>
Tested-by: Jenkins
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lnet/include/uapi/linux/lnet/libcfs_ioctl.h b/lnet/include/uapi/linux/lnet/libcfs_ioctl.h
index cdac10f..1b0daad 100644 (file)
--- a/lnet/include/uapi/linux/lnet/libcfs_ioctl.h
+++ b/lnet/include/uapi/linux/lnet/libcfs_ioctl.h
@@ -75,14 +75,6 @@ struct libcfs_ioctl_data {
        char ioc_bulk[0];
 };
 
        char ioc_bulk[0];
 };
 

-struct libcfs_debug_ioctl_data {
-       struct libcfs_ioctl_hdr hdr;
-       unsigned int subs;
-       unsigned int debug;
-};
-
-/* 'f' ioctls are defined in lustre_ioctl.h and lustre_user.h except for: */
-#define LIBCFS_IOC_DEBUG_MASK             _IOWR('f', 250, long)

 #define IOCTL_LIBCFS_TYPE                long
 
 #define IOC_LIBCFS_TYPE                                      ('e')
 #define IOCTL_LIBCFS_TYPE                long
 
 #define IOC_LIBCFS_TYPE                                      ('e')

diff --git a/lustre/include/uapi/linux/lustre/lustre_ioctl.h b/lustre/include/uapi/linux/lustre/lustre_ioctl.h
index 0fc3a02..3c97d63 100644 (file)
--- a/lustre/include/uapi/linux/lustre/lustre_ioctl.h
+++ b/lustre/include/uapi/linux/lustre/lustre_ioctl.h
@@ -240,7 +240,7 @@ static inline __u32 obd_ioctl_packlen(struct obd_ioctl_data *data)
 #define OBD_IOC_STOP_LFSCK     _IOW('f', 231, OBD_IOC_DATA_TYPE)
 #define OBD_IOC_QUERY_LFSCK    _IOR('f', 232, struct obd_ioctl_data)
 /*     lustre/lustre_user.h    240-249 */
 #define OBD_IOC_STOP_LFSCK     _IOW('f', 231, OBD_IOC_DATA_TYPE)
 #define OBD_IOC_QUERY_LFSCK    _IOR('f', 232, struct obd_ioctl_data)
 /*     lustre/lustre_user.h    240-249 */

-/*     LIBCFS_IOC_DEBUG_MASK   250 */
+/* was LIBCFS_IOC_DEBUG_MASK   _IOWR('f', 250, long) until 2.11 */

 
 #define OBD_IOC_BARRIER                _IOWR('f', 261, OBD_IOC_DATA_TYPE)
 
 
 #define OBD_IOC_BARRIER                _IOWR('f', 261, OBD_IOC_DATA_TYPE)
 

diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c
index 431a42d..b160d35 100644 (file)
--- a/lustre/obdclass/class_obd.c
+++ b/lustre/obdclass/class_obd.c
@@ -290,27 +290,18 @@ EXPORT_SYMBOL(obd_ioctl_getdata);
 
 int class_handle_ioctl(unsigned int cmd, unsigned long arg)
 {
 
 int class_handle_ioctl(unsigned int cmd, unsigned long arg)
 {

-        char *buf = NULL;
-        struct obd_ioctl_data *data;
-        struct libcfs_debug_ioctl_data *debug_data;
-        struct obd_device *obd = NULL;
-        int err = 0, len = 0;
-        ENTRY;
-
-        /* only for debugging */
-        if (cmd == LIBCFS_IOC_DEBUG_MASK) {
-                debug_data = (struct libcfs_debug_ioctl_data*)arg;
-                libcfs_subsystem_debug = debug_data->subs;
-                libcfs_debug = debug_data->debug;
-                return 0;
-        }
+       char *buf = NULL;
+       struct obd_ioctl_data *data;
+       struct obd_device *obd = NULL;
+       int err = 0, len = 0;

 
 

-        CDEBUG(D_IOCTL, "cmd = %x\n", cmd);
+       ENTRY;
+       CDEBUG(D_IOCTL, "cmd = %x\n", cmd);

        if (obd_ioctl_getdata(&buf, &len, (void __user *)arg)) {
        if (obd_ioctl_getdata(&buf, &len, (void __user *)arg)) {

-                CERROR("OBD ioctl: data error\n");
-                RETURN(-EINVAL);
-        }
-        data = (struct obd_ioctl_data *)buf;
+               CERROR("OBD ioctl: data error\n");
+               RETURN(-EINVAL);
+       }
+       data = (struct obd_ioctl_data *)buf;

 
         switch (cmd) {
         case OBD_IOC_PROCESS_CFG: {
 
         switch (cmd) {
         case OBD_IOC_PROCESS_CFG: {