On 2013/07/24 2:31 AM, "mail-agent-nore...@emc.com"
<mail-agent-nore...@emc.com> wrote:
>From: Peng Tao <bergw...@gmail.com>
>
>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.
Tao
if the build is broken, wouldn't it make sense either to merge this patch
into
the original or land it earlier in the series to minimize/eliminate the
window
of un-bisectability?
Cheers, Andreas
PS - this is a bug introduced during porting to the upstream kernel, it
does
not exist in Lustre master branch.
>Cc: Andreas Dilger <andreas.dil...@intel.com>
>Signed-off-by: Peng Tao <tao.p...@emc.com>
>---
> 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 <libcfs/libcfs.h>
>+#include <linux/libcfs/libcfs.h>
> #include <lustre/lustre_errno.h>
>
> /*
>@@ -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
>
>
Cheers, Andreas
--
Andreas Dilger
Lustre Software Architect
Intel High Performance Data Division
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
