mkfs: add quota flags when setting up filesystem

If we're creating a metadir filesystem, the quota accounting and
enforcement flags persist until the sysadmin changes them.  Add a means
to specify those qflags at format time.

Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/man/man8/mkfs.xfs.8.in b/man/man8/mkfs.xfs.8.in
index 0c0cf1dc151e4fc31d87456c620d9ee7d5bb629d..32361cf973fcf8859cfb06fba4795e4ec176ef05 100644 (file)
--- a/man/man8/mkfs.xfs.8.in
+++ b/man/man8/mkfs.xfs.8.in
@@ -340,6 +340,54 @@ Set the autofsck filesystem property to this value.
 See the
 .BI xfs_scrub (8)
 manual page for more information on this property.
+.TP
+.B uquota
+If the metadata directory feature is enabled, the
+.B \-m uquota
+option will set up user quota accounting and enforcement at format time;
+specifying the quota options in fstab is no longer unnecessary.
+If metadata directories are not enabled, quotas must still be enabled via
+fstab.
+.TP
+.B gquota
+If the metadata directory feature is enabled, the
+.B \-m gquota
+option will set up group quota accounting and enforcement at format time;
+specifying the quota options in fstab is no longer unnecessary.
+If metadata directories are not enabled, quotas must still be enabled via
+fstab.
+.TP
+.B pquota
+If the metadata directory feature is enabled, the
+.B \-m pquota
+option will set up project quota accounting and enforcement at format time;
+specifying the quota options in fstab is no longer unnecessary.
+If metadata directories are not enabled, quotas must still be enabled via
+fstab.
+.TP
+.B uqnoenforce
+If the metadata directory feature is enabled, the
+.B \-m uqnoenforce
+option will set up user quota accounting at format time; specifying the quota
+options in fstab is no longer unnecessary.
+If metadata directories are not enabled, quotas must still be enabled via
+fstab.
+.TP
+.B gqnoenforce
+If the metadata directory feature is enabled, the
+.B \-m gqnoenforce
+option will set up group quota accounting at format time; specifying the quota
+options in fstab is no longer unnecessary.
+If metadata directories are not enabled, quotas must still be enabled via
+fstab.
+.TP
+.B pqnoenforce
+If the metadata directory feature is enabled, the
+.B \-m pqnoenforce
+option will set up project quota accounting at format time; specifying the
+quota options in fstab is no longer unnecessary.
+If metadata directories are not enabled, quotas must still be enabled via
+fstab.
 .RE
 .PP
 .PD 0

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index cd94cfd0b9370633ea25d1251d6d96b6683e479f..a15c19df03a86ddb57d83079d04b1db8fbb972e1 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -153,6 +153,12 @@ enum {
        M_BIGTIME,
        M_AUTOFSCK,
        M_METADIR,
+       M_UQUOTA,
+       M_GQUOTA,
+       M_PQUOTA,
+       M_UQNOENFORCE,
+       M_GQNOENFORCE,
+       M_PQNOENFORCE,
        M_MAX_OPTS,
 };
 
@@ -833,6 +839,12 @@ static struct opt_params mopts = {
                [M_BIGTIME] = "bigtime",
                [M_AUTOFSCK] = "autofsck",
                [M_METADIR] = "metadir",
+               [M_UQUOTA] = "uquota",
+               [M_GQUOTA] = "gquota",
+               [M_PQUOTA] = "pquota",
+               [M_UQNOENFORCE] = "uqnoenforce",
+               [M_GQNOENFORCE] = "gqnoenforce",
+               [M_PQNOENFORCE] = "pqnoenforce",
                [M_MAX_OPTS] = NULL,
        },
        .subopt_params = {
@@ -888,6 +900,48 @@ static struct opt_params mopts = {
                  .maxval = 1,
                  .defaultval = 1,
                },
+               { .index = M_UQUOTA,
+                 .conflicts = { { &mopts, M_UQNOENFORCE },
+                                { NULL, LAST_CONFLICT } },
+                 .minval = 0,
+                 .maxval = 1,
+                 .defaultval = 1,
+               },
+               { .index = M_GQUOTA,
+                 .conflicts = { { &mopts, M_GQNOENFORCE },
+                                { NULL, LAST_CONFLICT } },
+                 .minval = 0,
+                 .maxval = 1,
+                 .defaultval = 1,
+               },
+               { .index = M_PQUOTA,
+                 .conflicts = { { &mopts, M_GQNOENFORCE },
+                                { NULL, LAST_CONFLICT } },
+                 .minval = 0,
+                 .maxval = 1,
+                 .defaultval = 1,
+               },
+               { .index = M_UQNOENFORCE,
+                 .conflicts = { { &mopts, M_UQUOTA },
+                                { NULL, LAST_CONFLICT } },
+                 .minval = 0,
+                 .maxval = 1,
+                 .defaultval = 1,
+               },
+               { .index = M_GQNOENFORCE,
+                 .conflicts = { { &mopts, M_GQUOTA },
+                                { NULL, LAST_CONFLICT } },
+                 .minval = 0,
+                 .maxval = 1,
+                 .defaultval = 1,
+               },
+               { .index = M_PQNOENFORCE,
+                 .conflicts = { { &mopts, M_PQUOTA },
+                                { NULL, LAST_CONFLICT } },
+                 .minval = 0,
+                 .maxval = 1,
+                 .defaultval = 1,
+               },
        },
 };
 
@@ -945,6 +999,8 @@ struct sb_feat_args {
        bool    nortalign;
        bool    nrext64;
        bool    exchrange;              /* XFS_SB_FEAT_INCOMPAT_EXCHRANGE */
+
+       uint16_t qflags;
 };
 
 struct cli_params {
@@ -1083,6 +1139,8 @@ usage( void )
 /* metadata */         [-m crc=0|1,finobt=0|1,uuid=xxx,rmapbt=0|1,reflink=0|1,\n\
                            inobtcount=0|1,bigtime=0|1,autofsck=xxx,\n\
                            metadir=0|1]\n\
+/* quota */            [-m uquota|uqnoenforce,gquota|gqnoenforce,\n\
+                           pquota|pqnoenforce]\n\
 /* data subvol */      [-d agcount=n,agsize=n,file,name=xxx,size=num,\n\
                            (sunit=value,swidth=value|su=num,sw=num|noalign),\n\
                            sectsize=num,concurrency=num]\n\
@@ -1920,6 +1978,30 @@ meta_opts_parser(
        case M_METADIR:
                cli->sb_feat.metadir = getnum(value, opts, subopt);
                break;
+       case M_UQUOTA:
+               if (getnum(value, opts, subopt))
+                       cli->sb_feat.qflags |= XFS_UQUOTA_ACCT | XFS_UQUOTA_ENFD;
+               break;
+       case M_GQUOTA:
+               if (getnum(value, opts, subopt))
+                       cli->sb_feat.qflags |= XFS_GQUOTA_ACCT | XFS_GQUOTA_ENFD;
+               break;
+       case M_PQUOTA:
+               if (getnum(value, opts, subopt))
+                       cli->sb_feat.qflags |= XFS_PQUOTA_ACCT | XFS_PQUOTA_ENFD;
+               break;
+       case M_UQNOENFORCE:
+               if (getnum(value, opts, subopt))
+                       cli->sb_feat.qflags |= XFS_UQUOTA_ACCT;
+               break;
+       case M_GQNOENFORCE:
+               if (getnum(value, opts, subopt))
+                       cli->sb_feat.qflags |= XFS_GQUOTA_ACCT;
+               break;
+       case M_PQNOENFORCE:
+               if (getnum(value, opts, subopt))
+                       cli->sb_feat.qflags |= XFS_PQUOTA_ACCT;
+               break;
        default:
                return -EINVAL;
        }
@@ -2516,6 +2598,12 @@ _("metadata directory not supported without CRC support\n"));
                        usage();
                }
                cli->sb_feat.metadir = false;
+
+               if (cli->sb_feat.qflags) {
+                       fprintf(stderr,
+_("persistent quota flags not supported without CRC support\n"));
+                       usage();
+               }
        }
 
        if (!cli->sb_feat.finobt) {
@@ -2561,6 +2649,26 @@ _("cowextsize not supported without reflink support\n"));
                cli->sb_feat.exchrange = true;
        }
 
+       if (cli->sb_feat.qflags && cli->xi->rt.name) {
+               fprintf(stderr,
+_("persistent quota flags not supported with realtime volumes\n"));
+                               usage();
+       }
+
+       /*
+        * Persistent quota flags requires metadir support because older
+        * kernels (or current kernels with old filesystems) will reset qflags
+        * in the absence of any quota mount options.
+        */
+       if (cli->sb_feat.qflags && !cli->sb_feat.metadir) {
+               if (cli_opt_set(&mopts, M_METADIR)) {
+                       fprintf(stderr,
+_("persistent quota flags not supported without metadir support\n"));
+                       usage();
+               }
+               cli->sb_feat.metadir = true;
+       }
+
        /*
         * Exchange-range will be needed for space reorganization on filesystems
         * with realtime rmap or realtime reflink enabled, and there is no good
@@ -3811,6 +3919,9 @@ sb_set_features(
        if (fp->dirftype && !fp->crcs_enabled)
                sbp->sb_features2 |= XFS_SB_VERSION2_FTYPE;
 
+       if (fp->qflags)
+               sbp->sb_versionnum |= XFS_SB_VERSION_QUOTABIT;
+
        /* update whether extended features are in use */
        if (sbp->sb_features2 != 0)
                sbp->sb_versionnum |= XFS_SB_VERSION_MOREBITSBIT;
@@ -4337,7 +4448,7 @@ finish_superblock_setup(
                           (cfg->loginternal ? cfg->logblocks : 0);
        sbp->sb_frextents = 0;  /* will do a free later */
        sbp->sb_uquotino = sbp->sb_gquotino = sbp->sb_pquotino = 0;
-       sbp->sb_qflags = 0;
+       sbp->sb_qflags = cfg->sb_feat.qflags;
        sbp->sb_unit = cfg->dsunit;
        sbp->sb_width = cfg->dswidth;
        mp->m_features |= libxfs_sb_version_to_features(sbp);