nfsd4: make recall callback an asynchronous rpc

[safe/jmp/linux-2.6] / fs / gfs2 / mount.c

diff --git a/fs/gfs2/mount.c b/fs/gfs2/mount.c
index 3524ae8..f7e8527 100644 (file)
--- a/fs/gfs2/mount.c
+++ b/fs/gfs2/mount.c
@@ -12,7 +12,6 @@
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
 #include <linux/gfs2_ondisk.h>
-#include <linux/lm_interface.h>
 #include <linux/parser.h>
 
 #include "gfs2.h"
@@ -37,11 +36,15 @@ enum {
        Opt_quota_off,
        Opt_quota_account,
        Opt_quota_on,
+       Opt_quota,
+       Opt_noquota,
        Opt_suiddir,
        Opt_nosuiddir,
        Opt_data_writeback,
        Opt_data_ordered,
        Opt_meta,
+       Opt_discard,
+       Opt_nodiscard,
        Opt_err,
 };
 
@@ -61,11 +64,15 @@ static const match_table_t tokens = {
        {Opt_quota_off, "quota=off"},
        {Opt_quota_account, "quota=account"},
        {Opt_quota_on, "quota=on"},
+       {Opt_quota, "quota"},
+       {Opt_noquota, "noquota"},
        {Opt_suiddir, "suiddir"},
        {Opt_nosuiddir, "nosuiddir"},
        {Opt_data_writeback, "data=writeback"},
        {Opt_data_ordered, "data=ordered"},
        {Opt_meta, "meta"},
+       {Opt_discard, "discard"},
+       {Opt_nodiscard, "nodiscard"},
        {Opt_err, NULL}
 };
 
@@ -135,12 +142,14 @@ int gfs2_mount_args(struct gfs2_sbd *sdp, struct gfs2_args *args, char *options)
                        args->ar_posix_acl = 0;
                        break;
                case Opt_quota_off:
+               case Opt_noquota:
                        args->ar_quota = GFS2_QUOTA_OFF;
                        break;
                case Opt_quota_account:
                        args->ar_quota = GFS2_QUOTA_ACCOUNT;
                        break;
                case Opt_quota_on:
+               case Opt_quota:
                        args->ar_quota = GFS2_QUOTA_ON;
                        break;
                case Opt_suiddir:
@@ -158,6 +167,12 @@ int gfs2_mount_args(struct gfs2_sbd *sdp, struct gfs2_args *args, char *options)
                case Opt_meta:
                        args->ar_meta = 1;
                        break;
+               case Opt_discard:
+                       args->ar_discard = 1;
+                       break;
+               case Opt_nodiscard:
+                       args->ar_discard = 0;
+                       break;
                case Opt_err:
                default:
                        fs_info(sdp, "invalid mount option: %s\n", o);