Commit b9a96945 authored by Steven Whitehouse's avatar Steven Whitehouse Committed by Steven Whitehouse

GFS2: Support quota/noquota mount arguments

This adds support for "quota" and "noquota" mount options in addition to the
existing "quota=on/off/account" so that we are compatible with the names by
which these options are more generally known.
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 223b2b88
...@@ -36,6 +36,8 @@ enum { ...@@ -36,6 +36,8 @@ enum {
Opt_quota_off, Opt_quota_off,
Opt_quota_account, Opt_quota_account,
Opt_quota_on, Opt_quota_on,
Opt_quota,
Opt_noquota,
Opt_suiddir, Opt_suiddir,
Opt_nosuiddir, Opt_nosuiddir,
Opt_data_writeback, Opt_data_writeback,
...@@ -62,6 +64,8 @@ static const match_table_t tokens = { ...@@ -62,6 +64,8 @@ static const match_table_t tokens = {
{Opt_quota_off, "quota=off"}, {Opt_quota_off, "quota=off"},
{Opt_quota_account, "quota=account"}, {Opt_quota_account, "quota=account"},
{Opt_quota_on, "quota=on"}, {Opt_quota_on, "quota=on"},
{Opt_quota, "quota"},
{Opt_noquota, "noquota"},
{Opt_suiddir, "suiddir"}, {Opt_suiddir, "suiddir"},
{Opt_nosuiddir, "nosuiddir"}, {Opt_nosuiddir, "nosuiddir"},
{Opt_data_writeback, "data=writeback"}, {Opt_data_writeback, "data=writeback"},
...@@ -138,12 +142,14 @@ int gfs2_mount_args(struct gfs2_sbd *sdp, struct gfs2_args *args, char *options) ...@@ -138,12 +142,14 @@ int gfs2_mount_args(struct gfs2_sbd *sdp, struct gfs2_args *args, char *options)
args->ar_posix_acl = 0; args->ar_posix_acl = 0;
break; break;
case Opt_quota_off: case Opt_quota_off:
case Opt_noquota:
args->ar_quota = GFS2_QUOTA_OFF; args->ar_quota = GFS2_QUOTA_OFF;
break; break;
case Opt_quota_account: case Opt_quota_account:
args->ar_quota = GFS2_QUOTA_ACCOUNT; args->ar_quota = GFS2_QUOTA_ACCOUNT;
break; break;
case Opt_quota_on: case Opt_quota_on:
case Opt_quota:
args->ar_quota = GFS2_QUOTA_ON; args->ar_quota = GFS2_QUOTA_ON;
break; break;
case Opt_suiddir: case Opt_suiddir:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment