On 10/10/2010 08:04 PM, Chuck Lever wrote:
> Clean up.
>
> fstab.c: In function âlock_mtabâ:
> fstab.c:385: warning: declaration of âerrsvâ shadows a previous local
> fstab.c:367: warning: shadowed declaration is here
> fstab.c:407: warning: declaration of âerrsvâ shadows a previous local
> fstab.c:367: warning: shadowed declaration is here
> fstab.c:417: warning: declaration of âtriesâ shadows a previous local
> fstab.c:325: warning: shadowed declaration is here
> fstab.c:422: warning: declaration of âerrsvâ shadows a previous local
> fstab.c:367: warning: shadowed declaration is here
Could you please post the gcc flags you using to generate
theses warnings... These warnings are not being generated with
the default gcc flags we are currently using...
tia,
steved.
> These are probably harmless. Reusing a variable name, however, is a
> little confusing to follow when reading the code.
>
> Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
> ---
>
> utils/mount/fstab.c | 29 ++++++++++++++++-------------
> 1 files changed, 16 insertions(+), 13 deletions(-)
>
> diff --git a/utils/mount/fstab.c b/utils/mount/fstab.c
> index 051fa38..a742e64 100644
> --- a/utils/mount/fstab.c
> +++ b/utils/mount/fstab.c
> @@ -364,19 +364,22 @@ lock_mtab (void) {
> /* Repeat until it was us who made the link */
> while (!we_created_lockfile) {
> struct flock flock;
> - int errsv, j;
> + int j;
>
> j = link(linktargetfile, MOUNTED_LOCK);
> - errsv = errno;
>
> - if (j == 0)
> - we_created_lockfile = 1;
> + {
> + int errsv = errno;
>
> - if (j < 0 && errsv != EEXIST) {
> - (void) unlink(linktargetfile);
> - die (EX_FILEIO, _("can't link lock file %s: %s "
> - "(use -n flag to override)"),
> - MOUNTED_LOCK, strerror (errsv));
> + if (j == 0)
> + we_created_lockfile = 1;
> +
> + if (j < 0 && errsv != EEXIST) {
> + (void) unlink(linktargetfile);
> + die (EX_FILEIO, _("can't link lock file %s: %s "
> + "(use -n flag to override)"),
> + MOUNTED_LOCK, strerror (errsv));
> + }
> }
>
> lockfile_fd = open (MOUNTED_LOCK, O_WRONLY);
> @@ -414,7 +417,7 @@ lock_mtab (void) {
> }
> (void) unlink(linktargetfile);
> } else {
> - static int tries = 0;
> + static int retries = 0;
>
> /* Someone else made the link. Wait. */
> alarm(LOCK_TIMEOUT);
> @@ -428,10 +431,10 @@ lock_mtab (void) {
> alarm(0);
> /* Limit the number of iterations - maybe there
> still is some old /etc/mtab~ */
> - ++tries;
> - if (tries % 200 == 0)
> + ++retries;
> + if (retries % 200 == 0)
> usleep(30);
> - if (tries > 100000) {
> + if (retries > 100000) {
> (void) unlink(linktargetfile);
> close(lockfile_fd);
> die (EX_FILEIO, _("Cannot create link %s\n"
>
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
