Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d035e336 authored by James Simmons's avatar James Simmons Committed by Linus Torvalds
Browse files

staging/lustre: remove IOC_LIBCFS_PING_TEST ioctl 



The ioctl IOC_LIBCFS_PING_TEST has not been used in ages.  The recent
nidstring changes which moved all the nidstring operations from libcfs
to the LNet layer but this ioctl code was still using an nidstring
operation that was causing a circular dependency loop between libcfs and
LNet.

Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d8cd93ea

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

+0 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ struct libcfs_ioctl_handler { 
#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)

#define IOC_LIBCFS_PING_TEST	       _IOWR('e', 37, long)

/* lnet ioctls */

#define IOC_LIBCFS_GET_NI		  _IOWR('e', 50, long)

#define IOC_LIBCFS_FAIL_NID		_IOWR('e', 51, long)

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

+0 −17
Original line number Diff line number Diff line
@@ -274,23 +274,6 @@ static int libcfs_ioctl_int(struct cfs_psdev_file *pfile, unsigned long cmd, 
		}

		break;



	case IOC_LIBCFS_PING_TEST: {

		extern void (kping_client)(struct libcfs_ioctl_data *);

		void (*ping)(struct libcfs_ioctl_data *);



		CDEBUG(D_IOCTL, "doing %d pings to nid %s (%s)\n",

		       data->ioc_count, libcfs_nid2str(data->ioc_nid),

		       libcfs_nid2str(data->ioc_nid));

		ping = symbol_get(kping_client);

		if (!ping)

			CERROR("symbol_get failed\n");

		else {

			ping(data);

			symbol_put(kping_client);

		}

		return 0;

	}



	default: {

		struct libcfs_ioctl_handler *hand;