Skip to contentSkip to conversation

text-based mount.nfs:

PATCH New Chuck Lever 1 participant 1 message Sep 11, 2007

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 12/19 text-based mount.nfs:

Introduce a function for probing the server for what it supports, and then rewriting the mount options as a result.

---

 utils/mount/stropts.c |  140 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 140 insertions(+), 0 deletions(-)
utils/mount/stropts.c +140 -0
index 03267be..deaf9e1 100644
@@ -210,6 +210,146 @@ static int fix_up_mounthost_opt(struct mount_options *options)
 }
 
 /*
+ * Reconstruct the mount option string based on a portmapper probe
+ * of the server.  Returns one if the server's portmapper returned
+ * something we can use, otherwise zero.
+ *
+ * Unfortunately, for fallback, we need to parse out the mount options
+ * in user space.  Unrecognized options are ignored here.
+ *
+ * Order of processing:
+ * 1.  fill in mnt_server and nfs_server, based on existing options
+ * 2.  strip out transport and NFS version related options
+ * 3.  probe the server
+ * 4.  append fresh transport and NFS version related options
+ *
+ * Returns 1 if successful.  Otherwise, returns zero.
+ */
+static int rewrite_mount_opts(struct mount_options *options)
+{
+	char *option, new_option[64];
+	clnt_addr_t mnt_server = { };
+	clnt_addr_t nfs_server = { };
+
+	option = po_get(options, "addr");
+	if (option) {
+		if (!inet_aton((const char *)option, &nfs_server.saddr.sin_addr))
+			return 0;
+	}
+
+	option = po_get(options, "mountaddr");
+	if (option) {
+		if (!inet_aton((const char *)option, &mnt_server.saddr.sin_addr))
+			return 0;
+	} else
+		memcpy(&mnt_server.saddr, &nfs_server.saddr,
+				sizeof(mnt_server.saddr));
+
+	option = po_get(options, "mountport");
+	if (option) {
+		mnt_server.pmap.pm_port = atoi(option);
+		po_remove_all(options, "mountport");
+	}
+	mnt_server.pmap.pm_prog = MOUNTPROG;
+	option = po_get(options, "mountprog");
+	if (option) {
+		mnt_server.pmap.pm_prog = atoi(option);
+		po_remove_all(options, "mountprog");
+	}
+	option = po_get(options, "mountvers");
+	if (option) {
+		mnt_server.pmap.pm_vers = atoi(option);
+		po_remove_all(options, "mountvers");
+	}
+
+	option = po_get(options, "port");
+	if (option) {
+		nfs_server.pmap.pm_port = atoi(option);
+		po_remove_all(options, "port");
+	}
+	nfs_server.pmap.pm_prog = NFS_PROGRAM;
+	option = po_get(options, "nfsprog");
+	if (option) {
+		nfs_server.pmap.pm_prog = atoi(option);
+		po_remove_all(options, "nfsprog");
+	}
+
+	po_remove_all(options, "nfsvers");
+	po_remove_all(options, "vers");
+	po_remove_all(options, "tcp");
+	po_remove_all(options, "udp");
+
+	option = po_get(options, "proto");
+	if (option) {
+		if (strcmp(option, "tcp") == 0)
+			po_remove_all(options, "proto");
+		if (strcmp(option, "udp") == 0)
+			po_remove_all(options, "proto");
+	}
+
+	if (!probe_bothports(&mnt_server, &nfs_server)) {
+		rpc_mount_errors("rpcbind", 0, 0);
+		return 0;
+	}
+
+	if (mnt_server.pmap.pm_prog != MOUNTPROG) {
+		snprintf(new_option, sizeof(new_option) - 1,
+			 "mountprog=%lu", mnt_server.pmap.pm_prog);
+		if (!po_append(options, new_option))
+			return 0;
+	}
+
+	snprintf(new_option, sizeof(new_option) - 1,
+		 "mountvers=%lu", mnt_server.pmap.pm_vers);
+	if (!po_append(options, new_option))
+		return 0;
+
+	if (mnt_server.pmap.pm_prot == IPPROTO_TCP)
+		snprintf(new_option, sizeof(new_option) - 1,
+			 "mountprot=tcp");
+	else
+		snprintf(new_option, sizeof(new_option) - 1,
+			 "mountprot=udp");
+	if (!po_append(options, new_option))
+		return 0;
+
+	snprintf(new_option, sizeof(new_option) - 1,
+		 "mountport=%lu", mnt_server.pmap.pm_port);
+	if (!po_append(options, new_option))
+		return 0;
+
+	if (nfs_server.pmap.pm_prog != NFS_PROGRAM) {
+		snprintf(new_option, sizeof(new_option) - 1,
+			 "nfsprog=%lu", nfs_server.pmap.pm_prog);
+		if (!po_append(options, new_option))
+			return 0;
+	}
+
+	snprintf(new_option, sizeof(new_option) - 1,
+		 "nfsvers=%lu", nfs_server.pmap.pm_vers);
+	po_append(options, new_option);
+
+	if (nfs_server.pmap.pm_prot == IPPROTO_TCP)
+		snprintf(new_option, sizeof(new_option) - 1,
+			 "proto=tcp");
+	else
+		snprintf(new_option, sizeof(new_option) - 1,
+			 "proto=udp");
+	if (!po_append(options, new_option))
+		return 0;
+
+	if (nfs_server.pmap.pm_port != NFS_PORT) {
+		snprintf(new_option, sizeof(new_option) - 1,
+			 "port=%lu", nfs_server.pmap.pm_port);
+		if (!po_append(options, new_option))
+			return 0;
+
+	}
+
+	return 1;
+}
+
+/*
  * Attempt an NFS mount via a mount(2) system call.
  *
  * Returns 1 if successful.  Otherwise, returns zero.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs