Re: [PATCH] [BZ 14256] Fix ESTALE error message

["Carlos O'Donell" <carlos at redhat dot com>]

On 05/23/2013 04:14 PM, Jeff Law wrote:
> Here we go.  manual/errno.texi updated with sysdeps/gnu/errlist.c regenerated.

This change doesn't do what your original change did.

In the original change you actually changed the error
message, here you just change the documentation.
 
> commit 53c81e693b7ae49cfa103fe164ac3c378050467f
> Author: Jeff Law <law@redhat.com>
> Date:   Thu May 23 13:28:00 2013 -0600
> 
>            [BZ #14256]

>             * manual/errlist.texi (ESTALE): Update to account for more than

It's manual/errno.texi.

>             just NFS file systems.
>             * sysdeps/gnu/errlist.c: Regenerated.
> 
> diff --git a/ChangeLog b/ChangeLog
> index a0387bd..d676d6a 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,10 @@
> +2012-05-23  Jeff Law  <law@redhat.com>
> +
> +	[BZ #14256]
> +	* manual/errlist.texi (ESTALE): Update to account for more than
> +	just NFS file systems.
> +	* sysdeps/gnu/errlist.c: Regenerated.
> +
>  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/manual/errno.texi b/manual/errno.texi
> index 2a3c004..4565712 100644
> --- a/manual/errno.texi
> +++ b/manual/errno.texi
> @@ -742,10 +742,11 @@ The user's disk quota was exceeded.
>  @comment BSD: Stale NFS file handle

You missed changing the comment which is parsed to generate the message.

>  @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..6546a6f 100644
> --- a/sysdeps/gnu/errlist.c
> +++ b/sysdeps/gnu/errlist.c
> @@ -780,10 +780,11 @@ 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. */
> +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 NFS file handle"),

Failing to change the comment fails to remove 'NFS' here.

>  # if ESTALE > ERR_MAX
>  # undef ERR_MAX

OK once you prove you actually smoke tested this change like
building a test application against the new glibc that uses
perror to show the new message?

http://sourceware.org/glibc/wiki/Testing/Builds

Cheers,
Carlos.