Commit 68cf5b83 authored by Parinay Kondekar's avatar Parinay Kondekar Committed by Greg Kroah-Hartman

staging:lustre: remove last bits of the IOC_LIBCFS_PANIC ioctl

A few pieces still exist for the IOC_LIBCFS_PANIC ioctl. Remove
these last bits to prevent old tools from using them. The latest
lustre utilities no longer use this ioctl.
Signed-off-by: default avatarParinay Kondekar <parinay.kondekar@seagate.com>
Signed-off-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5844
Reviewed-on: http://review.whamcloud.com/17492Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5206726a
...@@ -97,7 +97,7 @@ do { \ ...@@ -97,7 +97,7 @@ do { \
#define IOC_LIBCFS_TYPE 'e' #define IOC_LIBCFS_TYPE 'e'
#define IOC_LIBCFS_MIN_NR 30 #define IOC_LIBCFS_MIN_NR 30
/* libcfs ioctls */ /* libcfs ioctls */
#define IOC_LIBCFS_PANIC _IOWR('e', 30, long) /* IOC_LIBCFS_PANIC obsolete in 2.8.0, was _IOWR('e', 30, IOCTL_LIBCFS_TYPE) */
#define IOC_LIBCFS_CLEAR_DEBUG _IOWR('e', 31, long) #define IOC_LIBCFS_CLEAR_DEBUG _IOWR('e', 31, long)
#define IOC_LIBCFS_MARK_DEBUG _IOWR('e', 32, long) #define IOC_LIBCFS_MARK_DEBUG _IOWR('e', 32, long)
#define IOC_LIBCFS_MEMHOG _IOWR('e', 36, long) #define IOC_LIBCFS_MEMHOG _IOWR('e', 36, long)
......
...@@ -141,15 +141,6 @@ static long libcfs_ioctl(struct file *file, ...@@ -141,15 +141,6 @@ static long libcfs_ioctl(struct file *file,
return -EINVAL; return -EINVAL;
} }
/* Handle platform-dependent IOC requests */
switch (cmd) {
case IOC_LIBCFS_PANIC:
if (!capable(CFS_CAP_SYS_BOOT))
return -EPERM;
panic("debugctl-invoked panic");
return 0;
}
if (libcfs_psdev_ops.p_ioctl) if (libcfs_psdev_ops.p_ioctl)
rc = libcfs_psdev_ops.p_ioctl(&pfile, cmd, (void __user *)arg); rc = libcfs_psdev_ops.p_ioctl(&pfile, cmd, (void __user *)arg);
else else
......
...@@ -145,10 +145,7 @@ static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, ...@@ -145,10 +145,7 @@ static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd,
case IOC_LIBCFS_CLEAR_DEBUG: case IOC_LIBCFS_CLEAR_DEBUG:
libcfs_debug_clear_buffer(); libcfs_debug_clear_buffer();
break; break;
/*
* case IOC_LIBCFS_PANIC:
* Handled in arch/cfs_module.c
*/
case IOC_LIBCFS_MARK_DEBUG: case IOC_LIBCFS_MARK_DEBUG:
if (!data || !data->ioc_inlbuf1 || if (!data || !data->ioc_inlbuf1 ||
data->ioc_inlbuf1[data->ioc_inllen1 - 1] != '\0') { data->ioc_inlbuf1[data->ioc_inllen1 - 1] != '\0') {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment