X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Ferrno.c;h=50b89aa82ba720883b3b2465fb0bc9adad106ca8;hb=f625f670afbe954030ff81f0f8522137d6cdd335;hp=83aab13e642fce7750f4d239801f34a64fccb9ed;hpb=d98a6fefc9fcb67320502990613ca9deb934b4d6;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/errno.c b/lustre/ptlrpc/errno.c index 83aab13..50b89aa 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 @@ -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, @@ -188,7 +187,6 @@ static int lustre_errno_hton_mapping[] = { [EJUKEBOX] = LUSTRE_EJUKEBOX, [EIOCBQUEUED] = LUSTRE_EIOCBQUEUED, [EIOCBRETRY] = LUSTRE_EIOCBRETRY -#endif }; static int lustre_errno_ntoh_mapping[] = { @@ -321,7 +319,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, @@ -337,7 +334,6 @@ static int lustre_errno_ntoh_mapping[] = { [LUSTRE_EJUKEBOX] = EJUKEBOX, [LUSTRE_EIOCBQUEUED] = EIOCBQUEUED, [LUSTRE_EIOCBRETRY] = EIOCBRETRY -#endif }; unsigned int lustre_errno_hton(unsigned int h)