tcp: Restore ordering of TCP options for the sake of inter-operability

[linux-2.6-omap-h63xx.git] / fs / gfs2 / mount.c

diff --git a/fs/gfs2/mount.c b/fs/gfs2/mount.c
index b941f9f9f958e84a1fcf1a1431726e4f399a3b6c..f96eb90a2cfa1a58d7a16215e8833e38a6e6fff3 100644 (file)
--- a/fs/gfs2/mount.c
+++ b/fs/gfs2/mount.c
@@ -42,10 +42,11 @@ enum {
        Opt_nosuiddir,
        Opt_data_writeback,
        Opt_data_ordered,
+       Opt_meta,
        Opt_err,
 };
 
-static match_table_t tokens = {
+static const match_table_t tokens = {
        {Opt_lockproto, "lockproto=%s"},
        {Opt_locktable, "locktable=%s"},
        {Opt_hostdata, "hostdata=%s"},
@@ -66,6 +67,7 @@ static match_table_t tokens = {
        {Opt_nosuiddir, "nosuiddir"},
        {Opt_data_writeback, "data=writeback"},
        {Opt_data_ordered, "data=ordered"},
+       {Opt_meta, "meta"},
        {Opt_err, NULL}
 };
 
@@ -239,6 +241,11 @@ int gfs2_mount_args(struct gfs2_sbd *sdp, char *data_arg, int remount)
                case Opt_data_ordered:
                        args->ar_data = GFS2_DATA_ORDERED;
                        break;
+               case Opt_meta:
+                       if (remount && args->ar_meta != 1)
+                               goto cant_remount;
+                       args->ar_meta = 1;
+                       break;
                case Opt_err:
                default:
                        fs_info(sdp, "unknown option: %s\n", o);