diff options
| author | Peng Tao <tao.peng@emc.com> | 2013-07-24 18:08:18 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-24 20:04:46 (GMT) |
| commit | 17dc1597c5051757b58c5397f5162a21a746ecb7 (patch) | |
| tree | a3f9291843565bdb0f2354612288ac464d66d292 /drivers/staging/lustre | |
| parent | 46fd3c61e21a2906b2444ee854bcfefda60bcc4c (diff) | |
| download | linux-fsl-qoriq-17dc1597c5051757b58c5397f5162a21a746ecb7.tar.xz | |
staging/lustre: fix build on non-x86
On non-x86 we will build with Lustre's errno translate code but
it has a few issues.
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre')
| -rw-r--r-- | drivers/staging/lustre/lustre/ptlrpc/Makefile | 2 | ||||
| -rw-r--r-- | 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) |