Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753957AbbK0Ebn (ORCPT ); Thu, 26 Nov 2015 23:31:43 -0500 Received: from mga01.intel.com ([192.55.52.88]:30505 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753809AbbK0Ebk convert rfc822-to-8bit (ORCPT ); Thu, 26 Nov 2015 23:31:40 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,350,1444719600"; d="scan'208";a="695263375" From: "Dilger, Andreas" To: Greg Kroah-Hartman CC: Linus Torvalds , James Simmons , "Drokin, Oleg" , "devel@driverdev.osuosl.org" , "Linux Kernel Mailing List" , "lustre-devel@lists.lustre.org" Subject: Re: [PATCH v2] staging: lustre: remove IOC_LIBCFS_PING_TEST ioctl Thread-Topic: [PATCH v2] staging: lustre: remove IOC_LIBCFS_PING_TEST ioctl Thread-Index: AQHRKMyChKxx+RomMka3Zla2o8mYMA== Date: Fri, 27 Nov 2015 04:31:39 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.254.34.53] Content-Type: text/plain; charset="us-ascii" Content-ID: Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2793 Lines: 77 On 2015/11/08, 09:34, "James Simmons" 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 >--- > .../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 -- 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/