From: Jeff Law <law@redhat.com>
Date: Thu, 23 May 2013 19:28:00 +0000 (-0600)
Subject:        [BZ #14256]
X-Git-Tag: glibc-2.18~186
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=96945714ec61951cc748da2b4b8a80cf02127ee9;p=platform%2Fupstream%2Fglibc.git

   [BZ #14256]
        * manual/errno.texi (ESTALE): Update to account for more than
        just NFS file systems.
        * sysdeps/gnu/errlist.c: Regenerated.
---

diff --git a/ChangeLog b/ChangeLog
index 1d7b555..89b7bce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-30  Jeff Law  <law@redhat.com>
+
+	[BZ #14256]
+	* manual/errno.texi (ESTALE): Update to account for more than
+	just NFS file systems.
+	* sysdeps/gnu/errlist.c: Regenerated.
+
 2013-05-29  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
 	[BZ #15465]
diff --git a/NEWS b/NEWS
index 4a1f83d..a66a9d7 100644
--- a/NEWS
+++ b/NEWS
@@ -10,16 +10,16 @@ Version 2.18
 * The following bugs are resolved with this release:
 
   2546, 2560, 5159, 6809, 10060, 10062, 10357, 10686, 11120, 11561, 12387,
-  12723, 13550, 13889, 13951, 13988, 14142, 14176, 14200, 14280, 14293,
-  14317, 14327, 14478, 14496, 14582, 14686, 14812, 14888, 14894, 14908,
-  14920, 14952, 14964, 14981, 14982, 14985, 14994, 14996, 15000, 15003,
-  15006, 15007, 15014, 15020, 15023, 15036, 15054, 15055, 15062, 15078,
-  15084, 15085, 15086, 15160, 15214, 15221, 15232, 15234, 15283, 15285,
-  15287, 15304, 15305, 15307, 15309, 15327, 15330, 15335, 15336, 15337,
-  15339, 15342, 15346, 15359, 15361, 15366, 15380, 15381, 15394, 15395,
-  15405, 15406, 15409, 15416, 15418, 15419, 15423, 15424, 15426, 15429,
-  15441, 15442, 15448, 15465, 15480, 15485, 15488, 15490, 15493, 15497,
-  15506, 15529.
+  12723, 13550, 13889, 13951, 13988, 14142, 14176, 14200, 14256, 14280,
+  14293, 14317, 14327, 14478, 14496, 14582, 14686, 14812, 14888, 14894,
+  14908, 14920, 14952, 14964, 14981, 14982, 14985, 14994, 14996, 15000,
+  15003, 15006, 15007, 15014, 15020, 15023, 15036, 15054, 15055, 15062,
+  15078, 15084, 15085, 15086, 15160, 15214, 15221, 15232, 15234, 15283,
+  15285, 15287, 15304, 15305, 15307, 15309, 15327, 15330, 15335, 15336,
+  15337, 15339, 15342, 15346, 15359, 15361, 15366, 15380, 15381, 15394,
+  15395, 15405, 15406, 15409, 15416, 15418, 15419, 15423, 15424, 15426,
+  15429, 15441, 15442, 15448, 15465, 15480, 15485, 15488, 15490, 15493,
+  15497, 15506, 15529.
 
 * CVE-2013-0242 Buffer overrun in regexp matcher has been fixed (Bugzilla
   #15078).
diff --git a/manual/errno.texi b/manual/errno.texi
index 2a3c004..6c9fa86 100644
--- a/manual/errno.texi
+++ b/manual/errno.texi
@@ -739,13 +739,14 @@ The user's disk quota was exceeded.
 @end deftypevr
 
 @comment errno.h
-@comment BSD: Stale NFS file handle
+@comment BSD: Stale file handle
 @deftypevr Macro int ESTALE
 @comment errno 70 @c DO NOT REMOVE
-Stale NFS file handle.  This indicates an internal confusion in the NFS
-system which is due to file system rearrangements on the server host.
-Repairing this condition usually requires unmounting and remounting
-the NFS file system on the local host.
+Stale file handle.  This indicates an internal confusion in the
+file system which is due to file system rearrangements on the server host
+for NFS file systems or corruption in other file systems.
+Repairing this condition usually requires unmounting, possibly repairing
+and remounting the file system.
 @end deftypevr
 
 @comment errno.h
diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c
index e3d2faf..bbd45f2 100644
--- a/sysdeps/gnu/errlist.c
+++ b/sysdeps/gnu/errlist.c
@@ -780,11 +780,12 @@ TRANS The user's disk quota was exceeded. */
 #endif
 #ifdef ESTALE
 /*
-TRANS Stale NFS file handle.  This indicates an internal confusion in the NFS
-TRANS system which is due to file system rearrangements on the server host.
-TRANS Repairing this condition usually requires unmounting and remounting
-TRANS the NFS file system on the local host. */
-    [ERR_REMAP (ESTALE)] = N_("Stale NFS file handle"),
+TRANS Stale file handle.  This indicates an internal confusion in the
+TRANS file system which is due to file system rearrangements on the server host
+TRANS for NFS file systems or corruption in other file systems.
+TRANS Repairing this condition usually requires unmounting, possibly repairing
+TRANS and remounting the file system. */
+    [ERR_REMAP (ESTALE)] = N_("Stale file handle"),
 # if ESTALE > ERR_MAX
 # undef ERR_MAX
 # define ERR_MAX ESTALE