Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933083AbbFIO7x (ORCPT ); Tue, 9 Jun 2015 10:59:53 -0400 Received: from mta02.ornl.gov ([128.219.177.12]:59764 "EHLO mta02.ornl.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753859AbbFIO72 convert rfc822-to-8bit (ORCPT ); Tue, 9 Jun 2015 10:59:28 -0400 X-SG: RELAYLIST X-IronPort-AV: E=Sophos;i="5.13,581,1427774400"; d="scan'208";a="81595326" From: "Simmons, James A." To: "'Dilger, Andreas'" , Dan Carpenter , James Simmons CC: "devel@driverdev.osuosl.org" , "Greg Kroah-Hartman" , "Drokin, Oleg" , Linux Kernel Mailing List , "lustre-devel@lists.lustre.org" Subject: RE: [lustre-devel] [PATCH v3 5/8] staging:lustre: separate kernel and user land defines in the LNet headers Thread-Topic: [lustre-devel] [PATCH v3 5/8] staging:lustre: separate kernel and user land defines in the LNet headers Thread-Index: AQHQn256gZjab592rku9Xm8IEl8tJZ2jnBkAgACt2zA= Date: Tue, 9 Jun 2015 14:59:26 +0000 Message-ID: <8fc5cd45fda6439f9cad8c8a7b504db9@EXCHCS32.ornl.gov> References: <1433364207-14307-1-git-send-email-jsimmons@infradead.org> <1433364207-14307-6-git-send-email-jsimmons@infradead.org> <20150605090226.GM28762@mwanda> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [128.219.12.132] Content-Type: text/plain; charset="us-ascii" 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: 1774 Lines: 39 >On 2015/06/05, 3:02 AM, "Dan Carpenter" wrote: > >>On Wed, Jun 03, 2015 at 04:43:24PM -0400, James Simmons wrote: >>> Currently the lnet headers used by user land contain various internal >>> LNet structures that are only used by kernel space. Move the user land >>> structures to headers used by user land. The kernel structures are >>> relocated to headers that are never exposed to user land. >>> >>> Signed-off-by: James Simmons >>> --- >>> diff --git a/drivers/staging/lustre/lnet/lnet/acceptor.c >>>b/drivers/staging/lustre/lnet/lnet/acceptor.c >>> index 1dc7c8a..4928f5c 100644 >>> --- a/drivers/staging/lustre/lnet/lnet/acceptor.c >>> +++ b/drivers/staging/lustre/lnet/lnet/acceptor.c >>> @@ -243,8 +243,6 @@ lnet_accept(struct socket *sock, __u32 magic) >>> >>> if (magic == le32_to_cpu(LNET_PROTO_TCP_MAGIC)) >>> str = "'old' socknal/tcpnal"; >>> - else if (lnet_accept_magic(magic, LNET_PROTO_RA_MAGIC)) >>> - str = "'old' ranal"; >>> else >>> str = "unrecognised"; >>> >> >>Presumably this was done intentionally. We deleted LNET_PROTO_RA_MAGIC. >>The changelog was not very clear why. > >The "Rapid Array" network interface is an obsolete network once used by >Cray hardware but hasn't been supported for about 10 years and was (mostly) >deleted from the tree already. This was just a left-over I guess. I need to break this patch up and do a proper backport of the patch from LU-6209. Currently it is mixed in with this header cleanup. -- 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/