lkml.org 
[lkml]   [2013]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH 8/8] staging/lustre: fix errno translate code on non-x86
On Thu, Jul 25, 2013 at 1:27 AM, Dilger, Andreas
<andreas.dilger@intel.com> wrote:
> On 2013/07/24 2:31 AM, "mail-agent-noreply@emc.com"
> <mail-agent-noreply@emc.com> wrote:
>
>>From: Peng Tao <bergwolf@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?
>
The original one introduced the bug is already merged. See commit
2d58de78b2f6c53688a154b02bae3ada19ed15a9 in Greg's staging-next
(staging/lustre/ptlrpc: Translate between host and network errnos). So
we need to fix it in a separate patch.

And I agree with you that we need to put this one just before the
Kconfig fixup so that we don't break bisectability.

> Cheers, Andreas
>
> PS - this is a bug introduced during porting to the upstream kernel, it
> does
> not exist in Lustre master branch.
>
Lustre master also need fixing. EIOCBRETRY is removed in recent
kernels. We'll need to backport that part of the patch to Intel tree.

Thanks,
Tao


>>Cc: Andreas Dilger <andreas.dilger@intel.com>
>>Signed-off-by: Peng Tao <tao.peng@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
>
>


\
 
 \ /
  Last update: 2013-07-24 20:41    [W:0.054 / U:2.472 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site