X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fnfsumount.c;h=02d40ff9d2bcb32457f1414b073cbec16cb4f0b9;hp=04990f076a006893a5cdc61c8440697a3fa9be29;hb=3ef3dc8f1e87ba7a6eaa3c2a6965aff6c80ba414;hpb=c735a8331b082038a0e83ec4187c2656b0804eea diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c index 04990f0..02d40ff 100644 --- a/utils/mount/nfsumount.c +++ b/utils/mount/nfsumount.c @@ -31,12 +31,16 @@ #include "nls.h" #include "mount_constants.h" +#include "nfs_mount.h" #include "mount.h" #include "error.h" #include "network.h" #include "parse_opt.h" #include "parse_dev.h" +#define MOUNTSFILE "/proc/mounts" +#define LINELEN (4096) + #if !defined(MNT_FORCE) /* dare not try to include -- lots of errors */ #define MNT_FORCE 1 @@ -109,7 +113,7 @@ static int del_mtab(const char *spec, const char *node) res = try_remount(spec, node); if (res) goto writemtab; - return 0; + return EX_SUCCESS; } else umnt_err = errno; } @@ -127,7 +131,7 @@ static int del_mtab(const char *spec, const char *node) } if (res >= 0) - return 0; + return EX_SUCCESS; if (umnt_err) umount_error(umnt_err, node); @@ -169,12 +173,22 @@ out: static int nfs_umount_do_umnt(struct mount_options *options, char **hostname, char **dirname) { - struct sockaddr_storage address; - struct sockaddr *sap = (struct sockaddr *)&address; + union { + struct sockaddr sa; + struct sockaddr_in s4; + struct sockaddr_in6 s6; + } address; + struct sockaddr *sap = &address.sa; socklen_t salen = sizeof(address); struct pmap nfs_pmap, mnt_pmap; + sa_family_t family; + + if (!nfs_options2pmap(options, &nfs_pmap, &mnt_pmap)) + return EX_FAIL; - nfs_options2pmap(options, &nfs_pmap, &mnt_pmap); + /* Skip UMNT call for vers=4 mounts */ + if (nfs_pmap.pm_vers == 4) + return EX_SUCCESS; *hostname = nfs_umount_hostname(options, *hostname); if (!*hostname) { @@ -182,14 +196,17 @@ static int nfs_umount_do_umnt(struct mount_options *options, return EX_FAIL; } - if (nfs_name_to_address(*hostname, AF_UNSPEC, sap, &salen)) { - if (nfs_advise_umount(sap, salen, &mnt_pmap, dirname) != 0) - return EX_SUCCESS; - else - nfs_error(_("%s: Server failed to unmount '%s:%s'"), - progname, *hostname, *dirname); - } - return EX_FAIL; + if (!nfs_mount_proto_family(options, &family)) + return 0; + if (!nfs_lookup(*hostname, family, sap, &salen)) + /* nfs_lookup reports any errors */ + return EX_FAIL; + + if (nfs_advise_umount(sap, salen, &mnt_pmap, dirname) == 0) + /* nfs_advise_umount reports any errors */ + return EX_FAIL; + + return EX_SUCCESS; } /* @@ -229,96 +246,88 @@ static int nfs_umount23(const char *devname, char *string) } /* - * Pick up certain mount options used during the original mount - * from /etc/mtab. The basics include the server's IP address and - * the server pathname of the share to unregister. + * Detect NFSv4 mounts. * - * These options might also describe the mount port, mount protocol - * version, and transport protocol used to punch through a firewall. - * We will need this information to get through the firewall again - * to do the umount. + * Consult /proc/mounts to determine if the mount point + * is an NFSv4 mount. The kernel is authoritative about + * what type of mount this is. + * + * Returns 1 if "mc" is an NFSv4 mount, zero if not, and + * -1 if some error occurred. */ -static int do_nfs_umount23(const char *spec, char *opts) +static int nfs_umount_is_vers4(const struct mntentchn *mc) { - char *hostname; - char *dirname; - clnt_addr_t mnt_server = { &hostname, }; - struct mntent mnt = { .mnt_opts = opts }; - struct pmap *pmap = &mnt_server.pmap; - char *p; - int result = EX_USAGE; - - if (!nfs_parse_devname(spec, &hostname, &dirname)) - return result; - -#ifdef NFS_MOUNT_DEBUG - printf(_("host: %s, directory: %s\n"), hostname, dirname); -#endif - - if (opts && (p = strstr(opts, "addr="))) { - char *q; - - free(hostname); - p += 5; - q = p; - while (*q && *q != ',') q++; - hostname = xstrndup(p,q-p); + char buffer[LINELEN], *next; + int retval; + FILE *f; + + if ((f = fopen(MOUNTSFILE, "r")) == NULL) { + fprintf(stderr, "%s: %s\n", + MOUNTSFILE, strerror(errno)); + return -1; } - if (opts && (p = strstr(opts, "mounthost="))) { - char *q; - - free(hostname); - p += 10; - q = p; - while (*q && *q != ',') q++; - hostname = xstrndup(p,q-p); - } + retval = -1; + while (fgets(buffer, sizeof(buffer), f) != NULL) { + char *device, *mntdir, *type, *flags; + struct mount_options *options; + char *line = buffer; + + next = strchr(line, '\n'); + if (next != NULL) + *next = '\0'; + + device = strtok(line, " \t"); + if (device == NULL) + continue; + mntdir = strtok(NULL, " \t"); + if (mntdir == NULL) + continue; + if (strcmp(device, mc->m.mnt_fsname) != 0 && + strcmp(mntdir, mc->m.mnt_dir) != 0) + continue; + + type = strtok(NULL, " \t"); + if (type == NULL) + continue; + if (strcmp(type, "nfs4") == 0) + goto out_nfs4; + + flags = strtok(NULL, " \t"); + if (flags == NULL) + continue; + options = po_split(flags); + if (options != NULL) { + unsigned long version; + int rc; + + rc = nfs_nfs_version(options, &version); + po_destroy(options); + if (rc && version == 4) + goto out_nfs4; + } - pmap->pm_prog = MOUNTPROG; - pmap->pm_vers = 0; /* unknown */ - if (opts && (p = strstr(opts, "mountprog=")) && isdigit(*(p+10))) - pmap->pm_prog = atoi(p+10); - if (opts && (p = strstr(opts, "mountport=")) && isdigit(*(p+10))) - pmap->pm_port = atoi(p+10); - if (opts && hasmntopt(&mnt, "v2")) - pmap->pm_vers = nfsvers_to_mnt(2); - if (opts && hasmntopt(&mnt, "v3")) - pmap->pm_vers = nfsvers_to_mnt(3); - if (opts && (p = strstr(opts, "vers=")) && isdigit(*(p+5))) - pmap->pm_vers = nfsvers_to_mnt(atoi(p+5)); - if (opts && (p = strstr(opts, "mountvers=")) && isdigit(*(p+10))) - pmap->pm_vers = atoi(p+10); - if (opts && (hasmntopt(&mnt, "udp") - || hasmntopt(&mnt, "proto=udp") - || hasmntopt(&mnt, "mountproto=udp") - )) - pmap->pm_prot = IPPROTO_UDP; - if (opts && (hasmntopt(&mnt, "tcp") - || hasmntopt(&mnt, "proto=tcp") - || hasmntopt(&mnt, "mountproto=tcp") - )) - pmap->pm_prot = IPPROTO_TCP; - - if (!nfs_gethostbyname(hostname, &mnt_server.saddr)) { - nfs_error(_("%s: DNS resolution of '%s' failed"), - progname, hostname); - goto out; + goto out_nfs; } - - if (!nfs_call_umount(&mnt_server, &dirname)) { - nfs_error(_("%s: Server failed to unmount '%s'"), - progname, spec); - result = EX_FAIL; - goto out; - } - - result = EX_SUCCESS; + if (retval == -1) + fprintf(stderr, "%s was not found in %s\n", + mc->m.mnt_dir, MOUNTSFILE); out: - free(hostname); - free(dirname); - return result; + fclose(f); + return retval; + +out_nfs4: + if (verbose) + fprintf(stderr, "NFSv4 mount point detected\n"); + retval = 1; + goto out; + +out_nfs: + if (verbose) + fprintf(stderr, "Legacy NFS mount point detected\n"); + retval = 0; + goto out; } static struct option umount_longopts[] = @@ -425,7 +434,7 @@ int nfsumount(int argc, char *argv[]) char *opt = hasmntopt(&mc->m, "user"); struct passwd *pw; char *comma; - int len; + size_t len; if (!opt) goto only_root; if (opt[4] != '=') @@ -442,16 +451,25 @@ int nfsumount(int argc, char *argv[]) } } - ret = 0; + ret = EX_SUCCESS; if (mc) { - if (!lazy && strcmp(mc->m.mnt_type, "nfs4") != 0) - /* We ignore the error from nfs_umount23. - * If the actual umount succeeds (in del_mtab), - * we don't want to signal an error, as that - * could cause /sbin/mount to retry! - */ - nfs_umount23(mc->m.mnt_fsname, mc->m.mnt_opts); - ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir) ?: ret; + if (!lazy) { + switch (nfs_umount_is_vers4(mc)) { + case 0: + /* We ignore the error from nfs_umount23. + * If the actual umount succeeds (in del_mtab), + * we don't want to signal an error, as that + * could cause /sbin/mount to retry! + */ + nfs_umount23(mc->m.mnt_fsname, mc->m.mnt_opts); + break; + case 1: + break; + default: + return EX_FAIL; + } + } + ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir); } else if (*spec != '/') { if (!lazy) ret = nfs_umount23(spec, "tcp,v3");