Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1265127

[PATCH v2] staging: lustre: remove IOC_LIBCFS_PING_TEST ioctl

Show all headers | View raw

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 an circular
dependency loop between libcfs and LNet.

Signed-off-by: James Simmons <jsimmons@infradead.org>
---
 .../lustre/include/linux/libcfs/libcfs_ioctl.h     |    1 -
 drivers/staging/lustre/lustre/libcfs/module.c      |   17 -----------------
 2 files changed, 0 insertions(+), 18 deletions(-)

diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h
index f5d741f..485ab26 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h
@@ -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)
diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
index 570f05c..89038ed 100644
--- a/drivers/staging/lustre/lustre/libcfs/module.c
+++ b/drivers/staging/lustre/lustre/libcfs/module.c
@@ -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;
 
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2] staging: lustre: remove IOC_LIBCFS_PING_TEST ioctl James Simmons <jsimmons@infradead.org> - 2015-11-08 17:40 +0100
  [PATCH] staging: lustre: add libcfs version of cfs_strrstr James Simmons <jsimmons@infradead.org> - 2015-11-08 17:40 +0100
  [PATCH] staging: lustre: added debugging ability for LFSCK James Simmons <jsimmons@infradead.org> - 2015-11-08 17:40 +0100
  [PATCH] staging: lustre: add sparse locking annotations James Simmons <jsimmons@infradead.org> - 2015-11-08 17:40 +0100
  [PATCH] staging: lustre: export cfs_str2mask James Simmons <jsimmons@infradead.org> - 2015-11-08 17:40 +0100
    Re: [lustre-devel] [PATCH] staging: lustre: export cfs_str2mask "Drokin, Oleg" <oleg.drokin@intel.com> - 2015-11-09 12:10 +0100
      RE: [lustre-devel] [PATCH] staging: lustre: export cfs_str2mask "Simmons, James A." <simmonsja@ornl.gov> - 2015-11-10 01:50 +0100
  [PATCH] staging: lustre: Handle nodemask on UMP machines James Simmons <jsimmons@infradead.org> - 2015-11-08 17:40 +0100
    Re: [PATCH] staging: lustre: Handle nodemask on UMP machines Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-11-09 12:20 +0100
      RE: [lustre-devel] [PATCH] staging: lustre: Handle nodemask on UMP  machines "Simmons, James A." <simmonsja@ornl.gov> - 2015-11-10 01:50 +0100

csiph-web