diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2013-11-12 18:08:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 22:09:12 -0500 |
| commit | 0ca43435188b9f911c8efcdf10731f726142dda1 (patch) | |
| tree | c50d53a6d9e644cd7b75f5acfab519c1d52dba35 | |
| parent | 6c251611ce68d80e0067aab80a0a3b6bc652d5f5 (diff) | |
errno.h: remove "NFS" from descriptions in comments
glibc recently changed the error string for ESTALE to remove "NFS" -
https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=96945714ec61951cc748da2b4b8a80cf02127ee9
from: [ERR_REMAP (ESTALE)] = N_("Stale NFS file handle"),
to: [ERR_REMAP (ESTALE)] = N_("Stale file handle"),
And some have expressed concern that the kernel's errno.h
comments still refer to NFS.
So make that change... note that this is a comment-only change,
and has no functional difference.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/alpha/include/uapi/asm/errno.h | 2 | ||||
| -rw-r--r-- | arch/mips/include/uapi/asm/errno.h | 2 | ||||
| -rw-r--r-- | arch/parisc/include/uapi/asm/errno.h | 2 | ||||
| -rw-r--r-- | arch/sparc/include/uapi/asm/errno.h | 2 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/include/lustre/lustre_errno.h | 2 | ||||
| -rw-r--r-- | include/uapi/asm-generic/errno.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/alpha/include/uapi/asm/errno.h b/arch/alpha/include/uapi/asm/errno.h index e5f29ca28180..17f92aa76b2f 100644 --- a/arch/alpha/include/uapi/asm/errno.h +++ b/arch/alpha/include/uapi/asm/errno.h | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | 43 | ||
| 44 | #define EUSERS 68 /* Too many users */ | 44 | #define EUSERS 68 /* Too many users */ |
| 45 | #define EDQUOT 69 /* Quota exceeded */ | 45 | #define EDQUOT 69 /* Quota exceeded */ |
| 46 | #define ESTALE 70 /* Stale NFS file handle */ | 46 | #define ESTALE 70 /* Stale file handle */ |
| 47 | #define EREMOTE 71 /* Object is remote */ | 47 | #define EREMOTE 71 /* Object is remote */ |
| 48 | 48 | ||
| 49 | #define ENOLCK 77 /* No record locks available */ | 49 | #define ENOLCK 77 /* No record locks available */ |
diff --git a/arch/mips/include/uapi/asm/errno.h b/arch/mips/include/uapi/asm/errno.h index 31575e2fd1bd..02d645d7aa9a 100644 --- a/arch/mips/include/uapi/asm/errno.h +++ b/arch/mips/include/uapi/asm/errno.h | |||
| @@ -102,7 +102,7 @@ | |||
| 102 | #define EWOULDBLOCK EAGAIN /* Operation would block */ | 102 | #define EWOULDBLOCK EAGAIN /* Operation would block */ |
| 103 | #define EALREADY 149 /* Operation already in progress */ | 103 | #define EALREADY 149 /* Operation already in progress */ |
| 104 | #define EINPROGRESS 150 /* Operation now in progress */ | 104 | #define EINPROGRESS 150 /* Operation now in progress */ |
| 105 | #define ESTALE 151 /* Stale NFS file handle */ | 105 | #define ESTALE 151 /* Stale file handle */ |
| 106 | #define ECANCELED 158 /* AIO operation canceled */ | 106 | #define ECANCELED 158 /* AIO operation canceled */ |
| 107 | 107 | ||
| 108 | /* | 108 | /* |
diff --git a/arch/parisc/include/uapi/asm/errno.h b/arch/parisc/include/uapi/asm/errno.h index 135ad6047e51..f3a8aa554841 100644 --- a/arch/parisc/include/uapi/asm/errno.h +++ b/arch/parisc/include/uapi/asm/errno.h | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | #define EBADMSG 67 /* Not a data message */ | 37 | #define EBADMSG 67 /* Not a data message */ |
| 38 | #define EUSERS 68 /* Too many users */ | 38 | #define EUSERS 68 /* Too many users */ |
| 39 | #define EDQUOT 69 /* Quota exceeded */ | 39 | #define EDQUOT 69 /* Quota exceeded */ |
| 40 | #define ESTALE 70 /* Stale NFS file handle */ | 40 | #define ESTALE 70 /* Stale file handle */ |
| 41 | #define EREMOTE 71 /* Object is remote */ | 41 | #define EREMOTE 71 /* Object is remote */ |
| 42 | #define EOVERFLOW 72 /* Value too large for defined data type */ | 42 | #define EOVERFLOW 72 /* Value too large for defined data type */ |
| 43 | 43 | ||
diff --git a/arch/sparc/include/uapi/asm/errno.h b/arch/sparc/include/uapi/asm/errno.h index c351aba997b7..20423e172853 100644 --- a/arch/sparc/include/uapi/asm/errno.h +++ b/arch/sparc/include/uapi/asm/errno.h | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | #define EPROCLIM 67 /* SUNOS: Too many processes */ | 40 | #define EPROCLIM 67 /* SUNOS: Too many processes */ |
| 41 | #define EUSERS 68 /* Too many users */ | 41 | #define EUSERS 68 /* Too many users */ |
| 42 | #define EDQUOT 69 /* Quota exceeded */ | 42 | #define EDQUOT 69 /* Quota exceeded */ |
| 43 | #define ESTALE 70 /* Stale NFS file handle */ | 43 | #define ESTALE 70 /* Stale file handle */ |
| 44 | #define EREMOTE 71 /* Object is remote */ | 44 | #define EREMOTE 71 /* Object is remote */ |
| 45 | #define ENOSTR 72 /* Device not a stream */ | 45 | #define ENOSTR 72 /* Device not a stream */ |
| 46 | #define ETIME 73 /* Timer expired */ | 46 | #define ETIME 73 /* Timer expired */ |
diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_errno.h b/drivers/staging/lustre/lustre/include/lustre/lustre_errno.h index 2870487dd286..35aefa2cdad1 100644 --- a/drivers/staging/lustre/lustre/include/lustre/lustre_errno.h +++ b/drivers/staging/lustre/lustre/include/lustre/lustre_errno.h | |||
| @@ -165,7 +165,7 @@ | |||
| 165 | #define LUSTRE_EHOSTUNREACH 113 /* No route to host */ | 165 | #define LUSTRE_EHOSTUNREACH 113 /* No route to host */ |
| 166 | #define LUSTRE_EALREADY 114 /* Operation already in progress */ | 166 | #define LUSTRE_EALREADY 114 /* Operation already in progress */ |
| 167 | #define LUSTRE_EINPROGRESS 115 /* Operation now in progress */ | 167 | #define LUSTRE_EINPROGRESS 115 /* Operation now in progress */ |
| 168 | #define LUSTRE_ESTALE 116 /* Stale NFS file handle */ | 168 | #define LUSTRE_ESTALE 116 /* Stale file handle */ |
| 169 | #define LUSTRE_EUCLEAN 117 /* Structure needs cleaning */ | 169 | #define LUSTRE_EUCLEAN 117 /* Structure needs cleaning */ |
| 170 | #define LUSTRE_ENOTNAM 118 /* Not a XENIX named type file */ | 170 | #define LUSTRE_ENOTNAM 118 /* Not a XENIX named type file */ |
| 171 | #define LUSTRE_ENAVAIL 119 /* No XENIX semaphores available */ | 171 | #define LUSTRE_ENAVAIL 119 /* No XENIX semaphores available */ |
diff --git a/include/uapi/asm-generic/errno.h b/include/uapi/asm-generic/errno.h index a1331ce50445..1e1ea6e6e7a5 100644 --- a/include/uapi/asm-generic/errno.h +++ b/include/uapi/asm-generic/errno.h | |||
| @@ -86,7 +86,7 @@ | |||
| 86 | #define EHOSTUNREACH 113 /* No route to host */ | 86 | #define EHOSTUNREACH 113 /* No route to host */ |
| 87 | #define EALREADY 114 /* Operation already in progress */ | 87 | #define EALREADY 114 /* Operation already in progress */ |
| 88 | #define EINPROGRESS 115 /* Operation now in progress */ | 88 | #define EINPROGRESS 115 /* Operation now in progress */ |
| 89 | #define ESTALE 116 /* Stale NFS file handle */ | 89 | #define ESTALE 116 /* Stale file handle */ |
| 90 | #define EUCLEAN 117 /* Structure needs cleaning */ | 90 | #define EUCLEAN 117 /* Structure needs cleaning */ |
| 91 | #define ENOTNAM 118 /* Not a XENIX named type file */ | 91 | #define ENOTNAM 118 /* Not a XENIX named type file */ |
| 92 | #define ENAVAIL 119 /* No XENIX semaphores available */ | 92 | #define ENAVAIL 119 /* No XENIX semaphores available */ |