[lustre-devel] [PATCH v2] staging: lustre: remove IOC_LIBCFS_PING_TEST ioctl

[Dilger, Andreas <andreas.dilger@intel.com>]

On 2015/11/08, 09:34, "James Simmons" <jsimmons@infradead.org> wrote:

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

Hi Greg,
are you planning on pushing this patch to Linus for 4.4?  It was resent
on 11/08 per your request on 11/07 but I don't see it in staging or
staging-next yet.  Since it fixes the depmod dependency cycle for
allmodconfig builds on mainline it seems worthwhile to include into
4.4-rc3 rather than waiting for 4.5.

Cheers, Andreas


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