Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752727Ab3GXIg1 (ORCPT ); Wed, 24 Jul 2013 04:36:27 -0400 Received: from hop-nat-141.emc.com ([168.159.213.141]:32135 "EHLO mexforward.lss.emc.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750855Ab3GXIgY (ORCPT ); Wed, 24 Jul 2013 04:36:24 -0400 From: mail-agent-noreply@emc.com To: Greg Kroah-Hartman Cc: Linux Kernel Mailing List , Peng Tao , Andreas Dilger , Peng Tao Subject: [PATCH 8/8] staging/lustre: fix errno translate code on non-x86 Date: Wed, 24 Jul 2013 16:31:32 +0800 Message-Id: <1374654692-13237-9-git-send-email-mail-agent-noreply@emc.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1374654692-13237-8-git-send-email-mail-agent-noreply@emc.com> References: <1374654692-13237-1-git-send-email-mail-agent-noreply@emc.com> <1374654692-13237-2-git-send-email-mail-agent-noreply@emc.com> <1374654692-13237-3-git-send-email-mail-agent-noreply@emc.com> <1374654692-13237-4-git-send-email-mail-agent-noreply@emc.com> <1374654692-13237-5-git-send-email-mail-agent-noreply@emc.com> <1374654692-13237-6-git-send-email-mail-agent-noreply@emc.com> <1374654692-13237-7-git-send-email-mail-agent-noreply@emc.com> <1374654692-13237-8-git-send-email-mail-agent-noreply@emc.com> X-EMM-MHVC: 1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2164 Lines: 62 From: Peng Tao On non-x86 we will build with Lustre's errno translate code but it has a few issues that break build on non-x86 platforms. Cc: Andreas Dilger Signed-off-by: Peng Tao --- drivers/staging/lustre/lustre/ptlrpc/Makefile | 2 +- drivers/staging/lustre/lustre/ptlrpc/errno.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/lustre/lustre/ptlrpc/Makefile b/drivers/staging/lustre/lustre/ptlrpc/Makefile index a379558..6d78b80 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/Makefile +++ b/drivers/staging/lustre/lustre/ptlrpc/Makefile @@ -16,7 +16,7 @@ ptlrpc_objs += sec.o sec_bulk.o sec_gc.o sec_config.o sec_lproc.o ptlrpc_objs += sec_null.o sec_plain.o nrs.o nrs_fifo.o ptlrpc-y := $(ldlm_objs) $(ptlrpc_objs) -ptlrpc-$(CONFIG_LUSTRE_TRANSLATE_ERRNOS) += errno.c +ptlrpc-$(CONFIG_LUSTRE_TRANSLATE_ERRNOS) += errno.o obj-$(CONFIG_PTLRPC_GSS) += gss/ diff --git a/drivers/staging/lustre/lustre/ptlrpc/errno.c b/drivers/staging/lustre/lustre/ptlrpc/errno.c index 46e259e..1c10063 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/errno.c +++ b/drivers/staging/lustre/lustre/ptlrpc/errno.c @@ -25,7 +25,7 @@ * Copyright (c) 2013, Intel Corporation. */ -#include +#include #include /* @@ -184,7 +184,6 @@ static int lustre_errno_hton_mapping[] = { [EBADTYPE] = LUSTRE_EBADTYPE, [EJUKEBOX] = LUSTRE_EJUKEBOX, [EIOCBQUEUED] = LUSTRE_EIOCBQUEUED, - [EIOCBRETRY] = LUSTRE_EIOCBRETRY }; static int lustre_errno_ntoh_mapping[] = { @@ -331,7 +330,6 @@ static int lustre_errno_ntoh_mapping[] = { [LUSTRE_EBADTYPE] = EBADTYPE, [LUSTRE_EJUKEBOX] = EJUKEBOX, [LUSTRE_EIOCBQUEUED] = EIOCBQUEUED, - [LUSTRE_EIOCBRETRY] = EIOCBRETRY }; unsigned int lustre_errno_hton(unsigned int h) -- 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/