Steve Dickson [steved@xxxxxxxxxx] wrote:
> So path names are found during umounts, normalize
> path names by removing any extra slashes and add
> a lead slash if one does not exist.
>
> This normalization only has to occur when the mtab
> and /proc/mounts are not the same file.
>
> Signed-off-by: Steve Dickson <steved@xxxxxxxxxx>
> ---
> utils/mount/nfsumount.c | 64 +++++++++++++++++++++++++++++++++++++++++++++-
> 1 files changed, 62 insertions(+), 2 deletions(-)
>
> diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
> index 3538d88..0f77261 100644
> --- a/utils/mount/nfsumount.c
> +++ b/utils/mount/nfsumount.c
> @@ -140,6 +140,52 @@ static int del_mtab(const char *spec, const char *node)
> }
>
> /*
> + * To ensure the path is found during unmounts, strip
> + * off the multiple '/' or add a '/' if one does not exist.
> + */
> +static inline char *
> +normalize_path(char *spec)
> +{
> + char *colen, *ptr, *str, *dev;
> +
> + if ((colen = strchr(spec, ':')) == NULL)
> + return NULL;
> +
> + if (*(colen + 1) != '/') {
> + dev = str = malloc(strlen(spec) + 2);
> + if (dev == NULL)
> + return NULL;
> +
> + ptr = spec;
> + while (ptr <= colen)
> + *(str++) = *(ptr++);
> + *str++='/';
> + while (*ptr)
> + *(str++) = *(ptr++);
> + *str='\0';
> +
> + return dev;
> + }
> +
> + if (strstr(spec, "//") != NULL) {
> + dev = strdup(spec);
> + if (dev == NULL)
> + return NULL;
> +
> + colen = strchr(dev, ':');
> + ptr = (colen +1);
> + while (*ptr && *(ptr+1) == '/')
> + ptr++;
> + while (*ptr)
> + *(++colen) = *(ptr++);
> + *(colen+1) = '\0';
> +
> + return dev;
> + }
> + return NULL;
> +}
> +
> +/*
> * Detect NFSv4 mounts.
> *
> * Consult /proc/mounts to determine if the mount point
> @@ -154,6 +200,7 @@ static int nfs_umount_is_vers4(const struct mntentchn *mc)
> struct mntentchn *pmc;
> struct mount_options *options;
> int retval;
> + char *normpath=NULL;
>
> retval = -1;
> pmc = getprocmntdirbackward(mc->m.mnt_dir, NULL);
> @@ -171,8 +218,20 @@ static int nfs_umount_is_vers4(const struct mntentchn *mc)
> */
> while (pmc->m.mnt_fsname[nlen - 1] == '/')
> nlen--;
> - if (strncmp(pmc->m.mnt_fsname, mc->m.mnt_fsname, nlen) != 0)
> - continue;
> + /*
> + * When the mtab and /proc/mounts are not the same
> + * file, normalize the path in the mtab if needed.
> + */
> + if (mtab_is_writable())
> + normpath = normalize_path(mc->m.mnt_fsname);
> +
> + if (strncmp(pmc->m.mnt_fsname, mc->m.mnt_fsname, nlen) != 0) {
> + /* Is there a normalized path, if so compare that one too */
> + if (normpath == NULL)
> + continue;
> + if (strncmp(pmc->m.mnt_fsname, normpath, nlen) != 0)
> + continue;
You need to free normpath here before the "continue".
Also, when you normalize, why not go the extra mile of doing it all the
way as the patch I posted? I wanted to cover specs like
"host:/server/../home/./blah". This patch only does partial
normalization. The original patch also normalizes /proc/mount entry's
pathname (this avoids dealing with trailing '/' hack that exists now).
--
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
