git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nfs: Enclose hostname in brackets when needed in nfs_do_root_mount
[pandora-kernel.git]
/
fs
/
nfs
/
super.c
diff --git
a/fs/nfs/super.c
b/fs/nfs/super.c
index
3ada13c
..
376cd65
100644
(file)
--- a/
fs/nfs/super.c
+++ b/
fs/nfs/super.c
@@
-2708,11
+2708,15
@@
static struct vfsmount *nfs_do_root_mount(struct file_system_type *fs_type,
char *root_devname;
size_t len;
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);
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;
root_mnt = vfs_kern_mount(fs_type, flags, root_devname, data);
kfree(root_devname);
return root_mnt;