From 2af0e664838fba98e2ed81c986ebf90f7824a7b3 Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Tue, 11 Sep 2007 18:01:04 -0400
Subject: [PATCH] --- yaml --- r: 69215 b: refs/heads/master c:
 0ac83779fa5bffb90e32a97abc61f1840af31ee9 h: refs/heads/master i:   69213:
 4942877424257cf58ffbcd0798418a378718207d   69211:
 a3abb512c69a304739b2cf060a9e5a034641859d   69207:
 cc7f34b2c674f1648b287da8166e96c571baf45a   69199:
 e3e44588200b984a442b8f3ce1aa9868656c4f53   69183:
 211715b72d461c1f0351a910a8fdd5c16dd08847 v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/super.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0669a3238bbe..8287b0cb0caf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aad700073557c7932ef9f81c19a5e0647f8a6850
+refs/heads/master: 0ac83779fa5bffb90e32a97abc61f1840af31ee9
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 094d2f832c3c..a955821b8499 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -73,6 +73,7 @@ struct nfs_parsed_mount_data {
 
 	struct {
 		struct sockaddr_in	address;
+		char			*hostname;
 		unsigned int		program;
 		unsigned int		version;
 		unsigned short		port;
@@ -116,7 +117,7 @@ enum {
 
 	/* Mount options that take string arguments */
 	Opt_sec, Opt_proto, Opt_mountproto,
-	Opt_addr, Opt_mounthost, Opt_clientaddr,
+	Opt_addr, Opt_mountaddr, Opt_clientaddr,
 
 	/* Mount options that are ignored */
 	Opt_userspace, Opt_deprecated,
@@ -175,7 +176,8 @@ static match_table_t nfs_mount_option_tokens = {
 	{ Opt_mountproto, "mountproto=%s" },
 	{ Opt_addr, "addr=%s" },
 	{ Opt_clientaddr, "clientaddr=%s" },
-	{ Opt_mounthost, "mounthost=%s" },
+	{ Opt_userspace, "mounthost=%s" },
+	{ Opt_mountaddr, "mountaddr=%s" },
 
 	{ Opt_err, NULL }
 };
@@ -961,7 +963,7 @@ static int nfs_parse_mount_options(char *raw,
 				goto out_nomem;
 			mnt->client_address = string;
 			break;
-		case Opt_mounthost:
+		case Opt_mountaddr:
 			string = match_strdup(args);
 			if (string == NULL)
 				goto out_nomem;