This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] [BZ 14256] Fix ESTALE error message


Eons ago ESTALE was used exclusively by the NFS filesystem to note certain inconsistencies. For example, if a client holds a reference to a directory and the directory gets removed by another host.

Since then it's been used by at least a dozen other file systems. Including but not limited to NFS, ext2, ext3, ext4, fuse, GFS, BTRFS, JFS, CEPH, NTFS, XFS, ISOFS & AFS.

The error message for ESTALE unfortunately still references NFS which can be quite confusing if a non-NFS filesystem is reporting the error.

This patch fixes the error message from "Stale NFS file handle" to "Stale file handle".

OK for the trunk?

commit ab482f45bfbaff19eb2c5be6bce2b61cdd538c24
Author: Jeff Law <law@redhat.com>
Date:   Thu May 23 13:28:00 2013 -0600

            [BZ #14256]
            * sysdeps/gnu/errlist.c (ESTALE): Do not reference NFS in the
            error message.

diff --git a/ChangeLog b/ChangeLog
index a0387bd..23a7b05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-23  Jeff Law  <law@redhat.com>
+
+	[BZ #14256]
+	* sysdeps/gnu/errlist.c (ESTALE): Do not reference NFS in the
+	error message.
+
 2013-05-23  Edjunior Machado  <emachado@linux.vnet.ibm.com>
 
 	[BZ #14894]
diff --git a/NEWS b/NEWS
index 152e7a4..68407ae 100644
--- a/NEWS
+++ b/NEWS
@@ -10,15 +10,15 @@ 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, 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, 15394, 15395, 15405, 15406,
-  15409, 15416, 15418, 15419, 15423, 15424, 15426, 15429, 15441, 15442,
-  15448, 15480, 15485, 15488, 15490, 15493, 15497, 15506.
+  12723, 13550, 13889, 13951, 13988, 14142, 14176, 14200, 14256, 14280,
+  14293, 14317, 14327, 14478, 14496, 14582, 14686, 14812, 14888, 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, 15394, 15395, 15405,
+  15406, 15409, 15416, 15418, 15419, 15423, 15424, 15426, 15429, 15441,
+  15442, 15448, 15480, 15485, 15488, 15490, 15493, 15497, 15506.
 
 * CVE-2013-0242 Buffer overrun in regexp matcher has been fixed (Bugzilla
   #15078).
diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c
index e3d2faf..5437ff8 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 filesystems or corruption in other filesystems.
+TRANS Repairing this condition usually requires unmounting, possibly
+TRANS repairing and remounting the file system. */
+    [ERR_REMAP (ESTALE)] = N_("Stale file handle"),
 # if ESTALE > ERR_MAX
 # undef ERR_MAX
 # define ERR_MAX ESTALE

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]