- sync fedora branch: apparently "broken_suid" is deprecated

diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c
index f316add..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;