public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Shift key-related error codes up and insert ECANCELED
@ 2004-10-22 16:57 David Howells
  2004-10-22 17:14 ` Jakub Jelinek
  2004-10-22 18:34 ` Alan Cox
  0 siblings, 2 replies; 5+ messages in thread
From: David Howells @ 2004-10-22 16:57 UTC (permalink / raw)
  To: torvalds, akpm, jakub; +Cc: linux-kernel

[-- Attachment #1: Type: text/plain, Size: 547 bytes --]


This patch shifts the key-related error codes up by one and inserts an
ECANCELED error code where not already defined. It seems that has been defined
in glibc without passing it back to the kernel:-/

Who arbitrates error number allocations anyway?

Signed-Off-By: David Howells <dhowells@redhat.com>
---
warthog>diffstat errno-269bk5.diff 
 asm-alpha/errno.h   |    9 +++++----
 asm-generic/errno.h |    9 +++++----
 asm-sparc/errno.h   |    9 +++++----
 asm-sparc64/errno.h |    9 +++++----
 4 files changed, 20 insertions(+), 16 deletions(-)


[-- Attachment #2: errno-269bk5.diff --]
[-- Type: application/octet-stream, Size: 3541 bytes --]

diff -uNrp linux-2.6.9-bk5/include/asm-alpha/errno.h linux-2.6.9-bk5-keys/include/asm-alpha/errno.h
--- linux-2.6.9-bk5/include/asm-alpha/errno.h	2004-10-21 11:22:06.000000000 +0100
+++ linux-2.6.9-bk5-keys/include/asm-alpha/errno.h	2004-10-22 10:56:53.694968904 +0100
@@ -110,9 +110,10 @@
 
 #define ENOMEDIUM	129	/* No medium found */
 #define EMEDIUMTYPE	130	/* Wrong medium type */
-#define	ENOKEY		131	/* Required key not available */
-#define	EKEYEXPIRED	132	/* Key has expired */
-#define	EKEYREVOKED	133	/* Key has been revoked */
-#define	EKEYREJECTED	134	/* Key was rejected by service */
+#define	ECANCELED	131	/* Operation Cancelled */
+#define	ENOKEY		132	/* Required key not available */
+#define	EKEYEXPIRED	133	/* Key has expired */
+#define	EKEYREVOKED	134	/* Key has been revoked */
+#define	EKEYREJECTED	135	/* Key was rejected by service */
 
 #endif
diff -uNrp linux-2.6.9-bk5/include/asm-generic/errno.h linux-2.6.9-bk5-keys/include/asm-generic/errno.h
--- linux-2.6.9-bk5/include/asm-generic/errno.h	2004-10-21 11:22:06.000000000 +0100
+++ linux-2.6.9-bk5-keys/include/asm-generic/errno.h	2004-10-22 10:53:41.000000000 +0100
@@ -96,9 +96,10 @@
 
 #define	ENOMEDIUM	123	/* No medium found */
 #define	EMEDIUMTYPE	124	/* Wrong medium type */
-#define	ENOKEY		125	/* Required key not available */
-#define	EKEYEXPIRED	126	/* Key has expired */
-#define	EKEYREVOKED	127	/* Key has been revoked */
-#define	EKEYREJECTED	128	/* Key was rejected by service */
+#define	ECANCELED	125	/* Operation Canceled */
+#define	ENOKEY		126	/* Required key not available */
+#define	EKEYEXPIRED	127	/* Key has expired */
+#define	EKEYREVOKED	128	/* Key has been revoked */
+#define	EKEYREJECTED	129	/* Key was rejected by service */
 
 #endif
diff -uNrp linux-2.6.9-bk5/include/asm-sparc/errno.h linux-2.6.9-bk5-keys/include/asm-sparc/errno.h
--- linux-2.6.9-bk5/include/asm-sparc/errno.h	2004-10-21 11:22:08.000000000 +0100
+++ linux-2.6.9-bk5-keys/include/asm-sparc/errno.h	2004-10-22 10:56:37.393313534 +0100
@@ -101,9 +101,10 @@
 
 #define	ENOMEDIUM	125	/* No medium found */
 #define	EMEDIUMTYPE	126	/* Wrong medium type */
-#define	ENOKEY		127	/* Required key not available */
-#define	EKEYEXPIRED	128	/* Key has expired */
-#define	EKEYREVOKED	129	/* Key has been revoked */
-#define	EKEYREJECTED	130	/* Key was rejected by service */
+#define	ECANCELED	127	/* Operation Cancelled */
+#define	ENOKEY		128	/* Required key not available */
+#define	EKEYEXPIRED	129	/* Key has expired */
+#define	EKEYREVOKED	130	/* Key has been revoked */
+#define	EKEYREJECTED	131	/* Key was rejected by service */
 
 #endif
diff -uNrp linux-2.6.9-bk5/include/asm-sparc64/errno.h linux-2.6.9-bk5-keys/include/asm-sparc64/errno.h
--- linux-2.6.9-bk5/include/asm-sparc64/errno.h	2004-10-21 11:22:08.000000000 +0100
+++ linux-2.6.9-bk5-keys/include/asm-sparc64/errno.h	2004-10-22 10:57:10.858553145 +0100
@@ -101,9 +101,10 @@
 
 #define ENOMEDIUM       125     /* No medium found */
 #define EMEDIUMTYPE     126     /* Wrong medium type */
-#define	ENOKEY		127	/* Required key not available */
-#define	EKEYEXPIRED	128	/* Key has expired */
-#define	EKEYREVOKED	129	/* Key has been revoked */
-#define	EKEYREJECTED	130	/* Key was rejected by service */
+#define	ECANCELED	127	/* Operation Cancelled */
+#define	ENOKEY		128	/* Required key not available */
+#define	EKEYEXPIRED	129	/* Key has expired */
+#define	EKEYREVOKED	130	/* Key has been revoked */
+#define	EKEYREJECTED	131	/* Key was rejected by service */
 
 #endif /* !(_SPARC64_ERRNO_H) */

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2004-10-25  9:50 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-10-22 16:57 [PATCH] Shift key-related error codes up and insert ECANCELED David Howells
2004-10-22 17:14 ` Jakub Jelinek
2004-10-22 18:34 ` Alan Cox
2004-10-25  9:31   ` David Howells
2004-10-25  9:48     ` Arjan van de Ven

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox