From 7608841e96d04fc635b04ed1a8a948fe48be0238 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Sat, 3 Sep 2011 01:09:43 +0200
Subject: [PATCH] --- yaml --- r: 299646 b: refs/heads/master c:
 98a2139f4f4d7b5fcc3a54c7fddbe88612abed20 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ce4401fd3b2c..1b03de334fbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ccd271f7a3a846ce6f85ead0760d9d12994a611
+refs/heads/master: 98a2139f4f4d7b5fcc3a54c7fddbe88612abed20
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 37412f706b32..1e6715f0616c 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -2767,11 +2767,15 @@ static struct vfsmount *nfs_do_root_mount(struct file_system_type *fs_type,
 	char *root_devname;
 	size_t len;
 
-	len = strlen(hostname) + 3;
+	len = strlen(hostname) + 5;
 	root_devname = kmalloc(len, GFP_KERNEL);
 	if (root_devname == NULL)
 		return ERR_PTR(-ENOMEM);
-	snprintf(root_devname, len, "%s:/", hostname);
+	/* Does hostname needs to be enclosed in brackets? */
+	if (strchr(hostname, ':'))
+		snprintf(root_devname, len, "[%s]:/", hostname);
+	else
+		snprintf(root_devname, len, "%s:/", hostname);
 	root_mnt = vfs_kern_mount(fs_type, flags, root_devname, data);
 	kfree(root_devname);
 	return root_mnt;