Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17dc1597 authored by Peng Tao's avatar Peng Tao Committed by Greg Kroah-Hartman
Browse files

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: default avatarPeng Tao <tao.peng@emc.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 46fd3c61

drivers/staging/lustre/lustre/ptlrpc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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/

drivers/staging/lustre/lustre/ptlrpc/errno.c

+1 −3
Original line number Diff line number Diff line
@@ -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)