1 files changed, 18 insertions, 5 deletions

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index a88697ff19ef..f120be43d543 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -89,7 +89,7 @@ enum {
         Opt_nfsvers,
 
         /* Mount options that take string arguments */
-        Opt_sec, Opt_proto, Opt_mountproto,
+        Opt_sec, Opt_proto, Opt_mountproto, Opt_mounthost,
         Opt_addr, Opt_mountaddr, Opt_clientaddr,
 
         /* Mount options that are ignored */
@@ -148,7 +148,7 @@ static match_table_t nfs_mount_option_tokens = {
         { Opt_mountproto, "mountproto=%s" },
         { Opt_addr, "addr=%s" },
         { Opt_clientaddr, "clientaddr=%s" },
-        { Opt_userspace, "mounthost=%s" },
+        { Opt_mounthost, "mounthost=%s" },
         { Opt_mountaddr, "mountaddr=%s" },
 
         { Opt_err, NULL }
@@ -974,6 +974,12 @@ static int nfs_parse_mount_options(char *raw,
                                 goto out_nomem;
                         mnt->client_address = string;
                         break;
+                case Opt_mounthost:
+                        string = match_strdup(args);
+                        if (string == NULL)
+                                goto out_nomem;
+                        mnt->mount_server.hostname = string;
+                        break;
                 case Opt_mountaddr:
                         string = match_strdup(args);
                         if (string == NULL)
@@ -1027,6 +1033,7 @@ static int nfs_try_mount(struct nfs_parsed_mount_data *args,
 {
         struct sockaddr_in sin;
         int status;
+        char *hostname;
 
         if (args->mount_server.version == 0) {
                 if (args->flags & NFS_MOUNT_VER3)
@@ -1035,6 +1042,11 @@ static int nfs_try_mount(struct nfs_parsed_mount_data *args,
                         args->mount_server.version = NFS_MNT_VERSION;
         }
 
+        if (args->mount_server.hostname)
+                hostname = args->mount_server.hostname;
+        else
+                hostname = args->nfs_server.hostname;
+
         /*
          * Construct the mount server's address.
          */
@@ -1053,7 +1065,7 @@ static int nfs_try_mount(struct nfs_parsed_mount_data *args,
          */
         status = nfs_mount((struct sockaddr *) &sin,
                            sizeof(sin),
-                           args->nfs_server.hostname,
+                           hostname,
                            args->nfs_server.export_path,
                            args->mount_server.version,
                            args->mount_server.protocol,
@@ -1061,8 +1073,8 @@ static int nfs_try_mount(struct nfs_parsed_mount_data *args,
         if (status == 0)
                 return 0;
 
-        dfprintk(MOUNT, "NFS: unable to mount server " NIPQUAD_FMT
-                        ", error %d\n", NIPQUAD(sin.sin_addr.s_addr), status);
+        dfprintk(MOUNT, "NFS: unable to mount server %s, error %d",
+                        hostname, status);
         return status;
 }
 
@@ -1468,6 +1480,7 @@ static int nfs_get_sb(struct file_system_type *fs_type,
 
 out:
         kfree(data.nfs_server.hostname);
+        kfree(data.mount_server.hostname);
         return error;
 
 out_err_nosb: