X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Ferrno.c;h=96f6f75aceb4f0f70065f2457eb04b741769cf96;hb=d231bc874075672d3302727e53baef8f4dd03287;hp=83aab13e642fce7750f4d239801f34a64fccb9ed;hpb=d98a6fefc9fcb67320502990613ca9deb934b4d6;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/errno.c b/lustre/ptlrpc/errno.c
index 83aab13..96f6f75 100644
--- a/lustre/ptlrpc/errno.c
+++ b/lustre/ptlrpc/errno.c
@@ -22,7 +22,7 @@
 /*
  * Copyright (C) 2011 FUJITSU LIMITED.  All rights reserved.
  *
- * Copyright (c) 2013, Intel Corporation.
+ * Copyright (c) 2013, 2014, Intel Corporation.
  */
 
 #include <libcfs/libcfs.h>
@@ -172,7 +172,6 @@ static int lustre_errno_hton_mapping[] = {
 	[EKEYREJECTED]		= LUSTRE_EKEYREJECTED,
 	[EOWNERDEAD]		= LUSTRE_EOWNERDEAD,
 	[ENOTRECOVERABLE]	= LUSTRE_ENOTRECOVERABLE,
-#ifdef __KERNEL__
 	[ERESTARTSYS]		= LUSTRE_ERESTARTSYS,
 	[ERESTARTNOINTR]	= LUSTRE_ERESTARTNOINTR,
 	[ERESTARTNOHAND]	= LUSTRE_ERESTARTNOHAND,
@@ -186,9 +185,7 @@ static int lustre_errno_hton_mapping[] = {
 	[ESERVERFAULT]		= LUSTRE_ESERVERFAULT,
 	[EBADTYPE]		= LUSTRE_EBADTYPE,
 	[EJUKEBOX]		= LUSTRE_EJUKEBOX,
-	[EIOCBQUEUED]		= LUSTRE_EIOCBQUEUED,
-	[EIOCBRETRY]		= LUSTRE_EIOCBRETRY
-#endif
+	[EIOCBQUEUED]		= LUSTRE_EIOCBQUEUED
 };
 
 static int lustre_errno_ntoh_mapping[] = {
@@ -321,7 +318,6 @@ static int lustre_errno_ntoh_mapping[] = {
 	[LUSTRE_EKEYREJECTED]		= EKEYREJECTED,
 	[LUSTRE_EOWNERDEAD]		= EOWNERDEAD,
 	[LUSTRE_ENOTRECOVERABLE]	= ENOTRECOVERABLE,
-#ifdef __KERNEL__
 	[LUSTRE_ERESTARTSYS]		= ERESTARTSYS,
 	[LUSTRE_ERESTARTNOINTR]		= ERESTARTNOINTR,
 	[LUSTRE_ERESTARTNOHAND]		= ERESTARTNOHAND,
@@ -335,9 +331,7 @@ static int lustre_errno_ntoh_mapping[] = {
 	[LUSTRE_ESERVERFAULT]		= ESERVERFAULT,
 	[LUSTRE_EBADTYPE]		= EBADTYPE,
 	[LUSTRE_EJUKEBOX]		= EJUKEBOX,
-	[LUSTRE_EIOCBQUEUED]		= EIOCBQUEUED,
-	[LUSTRE_EIOCBRETRY]		= EIOCBRETRY
-#endif
+	[LUSTRE_EIOCBQUEUED]		= EIOCBQUEUED
 };
 
 unsigned int lustre_errno_hton(unsigned int h)