From: James Simmons Date: Mon, 20 Apr 2015 15:15:38 +0000 (-0400) Subject: LU-6426 lustre: remove EIOCBRETRY handling X-Git-Tag: 2.7.54~20 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F07%2F14507%2F2;p=fs%2Flustre-release.git LU-6426 lustre: remove EIOCBRETRY handling With linux commit 41003a7bcfed1255032e1e7c7b487e505b22e298 AIO retry handling was removed due to it being buggy and no one using it, including lustre. Since this is the case remove EIOCBRETRY since it no longer in the kernel starting with version 3.18. Change-Id: Icdc2de3fe252a6315914b906ef29c80343aa93e8 Signed-off-by: James Simmons Reviewed-on: http://review.whamcloud.com/14507 Reviewed-by: Bob Glossman Tested-by: Jenkins Reviewed-by: Dmitry Eremin Reviewed-by: Blake Caldwell Tested-by: Maloo Reviewed-by: Thomas Stibor Reviewed-by: Oleg Drokin --- diff --git a/lustre/include/lustre/lustre_errno.h b/lustre/include/lustre/lustre_errno.h index 74859f6..fe9ccd2 100644 --- a/lustre/include/lustre/lustre_errno.h +++ b/lustre/include/lustre/lustre_errno.h @@ -198,7 +198,6 @@ complete before timeout */ #define LUSTRE_EIOCBQUEUED 529 /* iocb queued, will get completion event */ -#define LUSTRE_EIOCBRETRY 530 /* iocb queued, will trigger a retry */ /* * Translations are optimized away on x86. Host errnos that shouldn't be put diff --git a/lustre/ptlrpc/errno.c b/lustre/ptlrpc/errno.c index 50b89aa..96f6f75 100644 --- a/lustre/ptlrpc/errno.c +++ b/lustre/ptlrpc/errno.c @@ -185,8 +185,7 @@ static int lustre_errno_hton_mapping[] = { [ESERVERFAULT] = LUSTRE_ESERVERFAULT, [EBADTYPE] = LUSTRE_EBADTYPE, [EJUKEBOX] = LUSTRE_EJUKEBOX, - [EIOCBQUEUED] = LUSTRE_EIOCBQUEUED, - [EIOCBRETRY] = LUSTRE_EIOCBRETRY + [EIOCBQUEUED] = LUSTRE_EIOCBQUEUED }; static int lustre_errno_ntoh_mapping[] = { @@ -332,8 +331,7 @@ static int lustre_errno_ntoh_mapping[] = { [LUSTRE_ESERVERFAULT] = ESERVERFAULT, [LUSTRE_EBADTYPE] = EBADTYPE, [LUSTRE_EJUKEBOX] = EJUKEBOX, - [LUSTRE_EIOCBQUEUED] = EIOCBQUEUED, - [LUSTRE_EIOCBRETRY] = EIOCBRETRY + [LUSTRE_EIOCBQUEUED] = EIOCBQUEUED }; unsigned int lustre_errno_hton(unsigned int h)