text-based mount.nfs: combine nfsmount_s() and nfs4mount_s() paths

The top-level logic that handles text-based mount options is mostly the
same for NFS and NFSv4 mounts.  To improve maintainability, let's combine
the nfsmount_s() and nfs4mount_s() functions.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index e6222317530da30c1ad56e2a217861d60cc2cdab..21946f727990af960e72ca2ad768b91adf134388 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -376,14 +376,10 @@ static int try_mount(char *spec, char *mount_point, int flags,
 {
        int ret;
 
-       if (string) {
-               if (strcmp(fs_type, "nfs4") == 0)
-                       ret = nfs4mount_s(spec, mount_point, flags,
-                                               extra_opts, fake, bg);
-               else
-                       ret = nfsmount_s(spec, mount_point, flags,
-                                               extra_opts, fake, bg);
-       } else {
+       if (string)
+               ret = nfsmount_string(spec, mount_point, fs_type, flags,
+                                       extra_opts, fake, bg);
+       else {
                if (strcmp(fs_type, "nfs4") == 0)
                        ret = nfs4mount(spec, mount_point, flags,
                                        extra_opts, fake, bg);

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 627031215a9c286ab76c0ff245722ea5f8105bd8..8859bf584bb44eb0a504f0bfd68d3ab460a93bc7 100644 (file)
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -365,3 +365,62 @@ out:
        po_destroy(options);
        return retval;
 }
+
+/**
+ * nfsmount_string - Mount an NFS file system using C string options
+ * @spec: C string specifying remote share to mount ("hostname:path")
+ * @node: C string pathname of local mounted-on directory
+ * @type: C string that represents file system type ("nfs" or "nfs4")
+ * @flags: MS_ style mount flags
+ * @extra_opts:        pointer to C string containing fs-specific mount options
+ *             (input and output argument)
+ * @fake: flag indicating whether to carry out the whole operation
+ * @child: one if this is a mount daemon (bg)
+ */
+int nfsmount_string(const char *spec, const char *node, const char *type,
+                   int flags, char **extra_opts, int fake, int child)
+{
+       struct mount_options *options = NULL;
+       struct sockaddr_in saddr;
+       char *hostname;
+       int err, retval = EX_FAIL;
+
+       if (!parse_devname(spec, &hostname))
+               goto out;
+       err = fill_ipv4_sockaddr(hostname, &saddr);
+       free(hostname);
+       if (!err)
+               goto out;
+
+       options = po_split(*extra_opts);
+       if (!options) {
+               nfs_error(_("%s: internal option parsing error"), progname);
+               goto out;
+       }
+
+       if (!set_mandatory_options(type, &saddr, options))
+               goto out;
+
+       if (po_join(options, extra_opts) == PO_FAILED) {
+               nfs_error(_("%s: internal option parsing error"), progname);
+               goto out;
+       }
+
+       if (verbose)
+               printf(_("%s: text-based options: '%s'\n"),
+                       progname, *extra_opts);
+
+       if (!fake) {
+               if (mount(spec, node, type,
+                               flags & ~(MS_USER|MS_USERS), *extra_opts)) {
+                       mount_error(spec, node, errno);
+                       goto out;
+               }
+       }
+
+       retval = EX_SUCCESS;
+
+out:
+       po_destroy(options);
+       return retval;
+}

diff --git a/utils/mount/stropts.h b/utils/mount/stropts.h
index a2a06048c0447edead6f4917e217d75d9f0083c6..b926d688612675d7eec70c67e620994b7f00c0de 100644 (file)
--- a/utils/mount/stropts.h
+++ b/utils/mount/stropts.h
@@ -21,5 +21,5 @@
  *
  */
 
-int nfsmount_s(const char *, const char *, int , char **, int, int);
-int nfs4mount_s(const char *, const char *, int, char **, int, int);
+int nfsmount_string(const char *, const char *, const char *, int,
+                       char **, int, int);