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

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/17492


Reviewed-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

drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ do { \ 
#define IOC_LIBCFS_TYPE		   'e'

#define IOC_LIBCFS_MIN_NR		 30

/* 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_MARK_DEBUG	      _IOWR('e', 32, long)

#define IOC_LIBCFS_MEMHOG		  _IOWR('e', 36, long)

drivers/staging/lustre/lnet/libcfs/linux/linux-module.c

+0 −9
Original line number Diff line number Diff line
@@ -141,15 +141,6 @@ static long libcfs_ioctl(struct file *file, 
		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)

		rc = libcfs_psdev_ops.p_ioctl(&pfile, cmd, (void __user *)arg);

	else

drivers/staging/lustre/lnet/libcfs/module.c

+1 −4
Original line number Diff line number Diff line
@@ -145,10 +145,7 @@ static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, 
	case IOC_LIBCFS_CLEAR_DEBUG:

		libcfs_debug_clear_buffer();

		break;

	/*

	 * case IOC_LIBCFS_PANIC:

	 * Handled in arch/cfs_module.c

	 */



	case IOC_LIBCFS_MARK_DEBUG:

		if (!data || !data->ioc_inlbuf1 ||

		    data->ioc_inlbuf1[data->ioc_inllen1 - 1] != '\0') {

CRA Git | Maintained and supported by SUSTech CRA and CCSE