vserver 2.0 rc7

[linux-2.6.git] / fs / nfs / nfsroot.c

diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c
index 7db9747..b26e22a 100644 (file)
--- a/fs/nfs/nfsroot.c
+++ b/fs/nfs/nfsroot.c
@@ -125,7 +125,7 @@ enum {
        Opt_soft, Opt_hard, Opt_intr,
        Opt_nointr, Opt_posix, Opt_noposix, Opt_cto, Opt_nocto, Opt_ac, 
        Opt_noac, Opt_lock, Opt_nolock, Opt_v2, Opt_v3, Opt_udp, Opt_tcp,
-       Opt_broken_suid, Opt_tagxid,
+       Opt_tagxid,
        /* Error token */
        Opt_err
 };
@@ -160,7 +160,6 @@ static match_table_t __initdata tokens = {
        {Opt_udp, "udp"},
        {Opt_tcp, "proto=tcp"},
        {Opt_tcp, "tcp"},
-       {Opt_broken_suid, "broken_suid"},
        {Opt_tagxid, "tagxid"},
        {Opt_err, NULL}
        
@@ -270,9 +269,6 @@ static int __init root_nfs_parse(char *name, char *buf)
                        case Opt_tcp:
                                nfs_data.flags |= NFS_MOUNT_TCP;
                                break;
-                       case Opt_broken_suid:
-                               nfs_data.flags |= NFS_MOUNT_BROKEN_SUID;
-                               break;
                        case Opt_tagxid:
                                nfs_data.flags |= NFS_MOUNT_TAGXID;
                                break;
@@ -356,7 +352,7 @@ static void __init root_nfs_print(void)
 #endif
 
 
-int __init root_nfs_init(void)
+static int __init root_nfs_init(void)
 {
 #ifdef NFSROOT_DEBUG
        nfs_debug |= NFSDBG_ROOT;
@@ -384,15 +380,15 @@ int __init root_nfs_init(void)
  *  Parse NFS server and directory information passed on the kernel
  *  command line.
  */
-int __init nfs_root_setup(char *line)
+static int __init nfs_root_setup(char *line)
 {
        ROOT_DEV = Root_NFS;
        if (line[0] == '/' || line[0] == ',' || (line[0] >= '0' && line[0] <= '9')) {
                strlcpy(nfs_root_name, line, sizeof(nfs_root_name));
        } else {
-               int n = strlen(line) + strlen(NFS_ROOT);
+               int n = strlen(line) + sizeof(NFS_ROOT) - 1;
                if (n >= sizeof(nfs_root_name))
-                       line[sizeof(nfs_root_name) - strlen(NFS_ROOT) - 1] = '\0';
+                       line[sizeof(nfs_root_name) - sizeof(NFS_ROOT) - 2] = '\0';
                sprintf(nfs_root_name, NFS_ROOT, line);
        }
        root_server_addr = root_nfs_parse_addr(nfs_root_name);