]> granicus.if.org Git - strace/blobdiff - quota.c
Remove XLAT_END
[strace] / quota.c
diff --git a/quota.c b/quota.c
index ec075f58b407e49d04950d721402ff49ebd2005c..e4073a21a581411ba7dd8f01a53bd1a51e21f8cd 100644 (file)
--- a/quota.c
+++ b/quota.c
@@ -4,32 +4,15 @@
  * Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
  * Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
  * Copyright (c) 2005-2016 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2006-2018 The strace developers.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
 #include "defs.h"
+#include "print_fields.h"
+#include "xfs_quota_stat.h"
 
 #define SUBCMDMASK  0x00ff
 #define SUBCMDSHIFT 8
 #include "xlat/xfs_quota_flags.h"
 #include "xlat/xfs_dqblk_flags.h"
 #include "xlat/if_dqblk_valid.h"
+#include "xlat/if_dqinfo_flags.h"
 #include "xlat/if_dqinfo_valid.h"
 
-struct if_dqblk
-{
+/*
+ * We add attribute packed due to the fact that the structure is 8-byte aligned
+ * on 64-bit systems and therefore has additional 4 bytes of padding, which
+ * leads to problems when it is used on 32-bit tracee which does not have such
+ * padding.
+ */
+struct if_dqblk {
        uint64_t dqb_bhardlimit;
        uint64_t dqb_bsoftlimit;
        uint64_t dqb_curspace;
@@ -59,36 +48,24 @@ struct if_dqblk
        uint64_t dqb_btime;
        uint64_t dqb_itime;
        uint32_t dqb_valid;
-};
-
-struct v1_dqblk
-{
-       uint32_t dqb_bhardlimit;        /* absolute limit on disk blks alloc */
-       uint32_t dqb_bsoftlimit;        /* preferred limit on disk blks */
-       uint32_t dqb_curblocks;         /* current block count */
-       uint32_t dqb_ihardlimit;        /* maximum # allocated inodes */
-       uint32_t dqb_isoftlimit;        /* preferred inode limit */
-       uint32_t dqb_curinodes;         /* current # allocated inodes */
-       time_t  dqb_btime;              /* time limit for excessive disk use */
-       time_t  dqb_itime;              /* time limit for excessive files */
-};
+} ATTRIBUTE_PACKED;
 
-struct v2_dqblk
-{
-       unsigned int dqb_ihardlimit;
-       unsigned int dqb_isoftlimit;
-       unsigned int dqb_curinodes;
-       unsigned int dqb_bhardlimit;
-       unsigned int dqb_bsoftlimit;
+struct if_nextdqblk {
+       uint64_t dqb_bhardlimit;
+       uint64_t dqb_bsoftlimit;
        uint64_t dqb_curspace;
-       time_t  dqb_btime;
-       time_t  dqb_itime;
+       uint64_t dqb_ihardlimit;
+       uint64_t dqb_isoftlimit;
+       uint64_t dqb_curinodes;
+       uint64_t dqb_btime;
+       uint64_t dqb_itime;
+       uint32_t dqb_valid;
+       uint32_t dqb_id;
 };
 
-struct xfs_dqblk
-{
+struct xfs_dqblk {
        int8_t  d_version;              /* version of this structure */
-       int8_t  d_flags;                /* XFS_{USER,PROJ,GROUP}_QUOTA */
+       uint8_t  d_flags;               /* XFS_{USER,PROJ,GROUP}_QUOTA */
        uint16_t d_fieldmask;           /* field specifier */
        uint32_t d_id;                  /* user, project, or group ID */
        uint64_t d_blk_hardlimit;       /* absolute limit on disk blks */
@@ -111,305 +88,337 @@ struct xfs_dqblk
        char    d_padding4[8];          /* yet more padding */
 };
 
-struct if_dqinfo
-{
+struct if_dqinfo {
        uint64_t dqi_bgrace;
        uint64_t dqi_igrace;
        uint32_t dqi_flags;
        uint32_t dqi_valid;
 };
 
-struct v2_dqinfo
-{
-       unsigned int dqi_bgrace;
-       unsigned int dqi_igrace;
-       unsigned int dqi_flags;
-       unsigned int dqi_blocks;
-       unsigned int dqi_free_blk;
-       unsigned int dqi_free_entry;
+struct fs_qfilestatv {
+       uint64_t qfs_ino, qfs_nblks;
+       uint32_t qfs_nextents, qfs_pad;
 };
 
-struct v1_dqstats
-{
-       uint32_t lookups;
-       uint32_t drops;
-       uint32_t reads;
-       uint32_t writes;
-       uint32_t cache_hits;
-       uint32_t allocated_dquots;
-       uint32_t free_dquots;
-       uint32_t syncs;
+struct fs_quota_statv {
+       int8_t qs_version;
+       uint8_t qs_pad1;
+       uint16_t qs_flags;
+       uint32_t qs_incoredqs;
+       struct fs_qfilestatv qs_uquota;
+       struct fs_qfilestatv qs_gquota;
+       struct fs_qfilestatv qs_pquota;
+       int32_t qs_btimelimit;
+       int32_t qs_itimelimit;
+       int32_t qs_rtbtimelimit;
+       uint16_t qs_bwarnlimit;
+       uint16_t qs_iwarnlimit;
+       uint64_t qs_pad2[8];
 };
 
-struct v2_dqstats
+static int
+decode_cmd_data(struct tcb *tcp, uint32_t id, uint32_t cmd, kernel_ulong_t data)
 {
-       uint32_t lookups;
-       uint32_t drops;
-       uint32_t reads;
-       uint32_t writes;
-       uint32_t cache_hits;
-       uint32_t allocated_dquots;
-       uint32_t free_dquots;
-       uint32_t syncs;
-       uint32_t version;
-};
+       switch (cmd) {
+       case Q_QUOTAOFF:
+       case Q_SYNC:
+       case Q_XQUOTASYNC:
+               break;
+       case Q_QUOTAON:
+               tprints(", ");
+               printxval(quota_formats, id, "QFMT_VFS_???");
+               tprints(", ");
+               printpath(tcp, data);
+               break;
+       case Q_GETQUOTA:
+               if (entering(tcp)) {
+                       printuid(", ", id);
+                       tprints(", ");
 
-typedef struct fs_qfilestat
-{
-       uint64_t qfs_ino;       /* inode number */
-       uint64_t qfs_nblks;     /* number of BBs 512-byte-blks */
-       uint32_t qfs_nextents;  /* number of extents */
-} fs_qfilestat_t;
+                       return 0;
+               }
 
-struct xfs_dqstats
-{
-       int8_t  qs_version;             /* version number for future changes */
-       uint16_t qs_flags;              /* XFS_QUOTA_{U,P,G}DQ_{ACCT,ENFD} */
-       int8_t  qs_pad;                 /* unused */
-       fs_qfilestat_t qs_uquota;       /* user quota storage information */
-       fs_qfilestat_t qs_gquota;       /* group quota storage information */
-       uint32_t qs_incoredqs;          /* number of dquots incore */
-       int32_t qs_btimelimit;          /* limit for blks timer */
-       int32_t qs_itimelimit;          /* limit for inodes timer */
-       int32_t qs_rtbtimelimit;        /* limit for rt blks timer */
-       uint16_t qs_bwarnlimit;         /* limit for num warnings */
-       uint16_t qs_iwarnlimit;         /* limit for num warnings */
-};
+               ATTRIBUTE_FALLTHROUGH;
+       case Q_SETQUOTA:
+       {
+               struct if_dqblk dq;
 
-static int
-decode_cmd_data(struct tcb *tcp, uint32_t cmd, unsigned long data)
-{
-       switch (cmd) {
-               case Q_GETQUOTA:
-                       if (entering(tcp))
-                               return 0;
-               case Q_SETQUOTA:
-               {
-                       struct if_dqblk dq;
-
-                       if (umove_or_printaddr(tcp, data, &dq))
-                               break;
-                       tprintf("{bhardlimit=%" PRIu64 ", ", dq.dqb_bhardlimit);
-                       tprintf("bsoftlimit=%" PRIu64 ", ", dq.dqb_bsoftlimit);
-                       tprintf("curspace=%" PRIu64 ", ", dq.dqb_curspace);
-                       tprintf("ihardlimit=%" PRIu64 ", ", dq.dqb_ihardlimit);
-                       tprintf("isoftlimit=%" PRIu64 ", ", dq.dqb_isoftlimit);
-                       tprintf("curinodes=%" PRIu64 ", ", dq.dqb_curinodes);
-                       if (!abbrev(tcp)) {
-                               tprintf("btime=%" PRIu64 ", ", dq.dqb_btime);
-                               tprintf("itime=%" PRIu64 ", ", dq.dqb_itime);
-                               tprints("valid=");
-                               printflags(if_dqblk_valid,
-                                          dq.dqb_valid, "QIF_???");
-                               tprints("}");
-                       } else
-                               tprints("...}");
-                       break;
+               if (entering(tcp)) {
+                       printuid(", ", id);
+                       tprints(", ");
                }
-               case Q_V1_GETQUOTA:
-                       if (entering(tcp))
-                               return 0;
-               case Q_V1_SETQUOTA:
-               {
-                       struct v1_dqblk dq;
-
-                       if (umove_or_printaddr(tcp, data, &dq))
-                               break;
-                       tprintf("{bhardlimit=%u, ", dq.dqb_bhardlimit);
-                       tprintf("bsoftlimit=%u, ", dq.dqb_bsoftlimit);
-                       tprintf("curblocks=%u, ", dq.dqb_curblocks);
-                       tprintf("ihardlimit=%u, ", dq.dqb_ihardlimit);
-                       tprintf("isoftlimit=%u, ", dq.dqb_isoftlimit);
-                       tprintf("curinodes=%u, ", dq.dqb_curinodes);
-                       tprintf("btime=%lu, ", (long) dq.dqb_btime);
-                       tprintf("itime=%lu}", (long) dq.dqb_itime);
+
+               if (umove_or_printaddr(tcp, data, &dq))
                        break;
+               PRINT_FIELD_U("{", dq, dqb_bhardlimit);
+               PRINT_FIELD_U(", ", dq, dqb_bsoftlimit);
+               PRINT_FIELD_U(", ", dq, dqb_curspace);
+               PRINT_FIELD_U(", ", dq, dqb_ihardlimit);
+               PRINT_FIELD_U(", ", dq, dqb_isoftlimit);
+               PRINT_FIELD_U(", ", dq, dqb_curinodes);
+               if (!abbrev(tcp)) {
+                       PRINT_FIELD_U(", ", dq, dqb_btime);
+                       PRINT_FIELD_U(", ", dq, dqb_itime);
+                       PRINT_FIELD_FLAGS(", ", dq, dqb_valid,
+                                         if_dqblk_valid, "QIF_???");
+               } else {
+                       tprints(", ...");
                }
-               case Q_V2_GETQUOTA:
-                       if (entering(tcp))
-                               return 0;
-               case Q_V2_SETQUOTA:
-               {
-                       struct v2_dqblk dq;
-
-                       if (umove_or_printaddr(tcp, data, &dq))
-                               break;
-                       tprintf("{ihardlimit=%u, ", dq.dqb_ihardlimit);
-                       tprintf("isoftlimit=%u, ", dq.dqb_isoftlimit);
-                       tprintf("curinodes=%u, ", dq.dqb_curinodes);
-                       tprintf("bhardlimit=%u, ", dq.dqb_bhardlimit);
-                       tprintf("bsoftlimit=%u, ", dq.dqb_bsoftlimit);
-                       tprintf("curspace=%" PRIu64 ", ", dq.dqb_curspace);
-                       tprintf("btime=%lu, ", (long) dq.dqb_btime);
-                       tprintf("itime=%lu}", (long) dq.dqb_itime);
-                       break;
+               tprints("}");
+               break;
+       }
+       case Q_GETNEXTQUOTA:
+       {
+               struct if_nextdqblk dq;
+
+               if (entering(tcp)) {
+                       printuid(", ", id);
+                       tprints(", ");
+
+                       return 0;
                }
-               case Q_XGETQUOTA:
-                       if (entering(tcp))
-                               return 0;
-               case Q_XSETQLIM:
-               {
-                       struct xfs_dqblk dq;
-
-                       if (umove_or_printaddr(tcp, data, &dq))
-                               break;
-                       tprintf("{version=%d, ", dq.d_version);
-                       tprints("flags=");
-                       printflags(xfs_dqblk_flags,
-                                  dq.d_flags, "XFS_???_QUOTA");
-                       tprintf(", fieldmask=%#x, ", dq.d_fieldmask);
-                       tprintf("id=%u, ", dq.d_id);
-                       tprintf("blk_hardlimit=%" PRIu64 ", ", dq.d_blk_hardlimit);
-                       tprintf("blk_softlimit=%" PRIu64 ", ", dq.d_blk_softlimit);
-                       tprintf("ino_hardlimit=%" PRIu64 ", ", dq.d_ino_hardlimit);
-                       tprintf("ino_softlimit=%" PRIu64 ", ", dq.d_ino_softlimit);
-                       tprintf("bcount=%" PRIu64 ", ", dq.d_bcount);
-                       tprintf("icount=%" PRIu64 ", ", dq.d_icount);
-                       if (!abbrev(tcp)) {
-                               tprintf("itimer=%d, ", dq.d_itimer);
-                               tprintf("btimer=%d, ", dq.d_btimer);
-                               tprintf("iwarns=%u, ", dq.d_iwarns);
-                               tprintf("bwarns=%u, ", dq.d_bwarns);
-                               tprintf("rtbcount=%" PRIu64 ", ", dq.d_rtbcount);
-                               tprintf("rtbtimer=%d, ", dq.d_rtbtimer);
-                               tprintf("rtbwarns=%u}", dq.d_rtbwarns);
-                       } else
-                               tprints("...}");
+
+               if (umove_or_printaddr(tcp, data, &dq))
                        break;
+               PRINT_FIELD_U("{", dq, dqb_bhardlimit);
+               PRINT_FIELD_U(", ", dq, dqb_bsoftlimit);
+               PRINT_FIELD_U(", ", dq, dqb_curspace);
+               PRINT_FIELD_U(", ", dq, dqb_ihardlimit);
+               PRINT_FIELD_U(", ", dq, dqb_isoftlimit);
+               PRINT_FIELD_U(", ", dq, dqb_curinodes);
+               if (!abbrev(tcp)) {
+                       PRINT_FIELD_U(", ", dq, dqb_btime);
+                       PRINT_FIELD_U(", ", dq, dqb_itime);
+                       PRINT_FIELD_FLAGS(", ", dq, dqb_valid,
+                                         if_dqblk_valid, "QIF_???");
+                       PRINT_FIELD_U(", ", dq, dqb_id);
+               } else {
+                       PRINT_FIELD_U(", ", dq, dqb_id);
+                       tprints(", ...");
                }
-               case Q_GETFMT:
-               {
-                       uint32_t fmt;
-
-                       if (entering(tcp))
-                               return 0;
-                       if (umove_or_printaddr(tcp, data, &fmt))
-                               break;
-                       tprints("[");
-                       printxval(quota_formats, fmt, "QFMT_VFS_???");
-                       tprints("]");
-                       break;
+               tprints("}");
+               break;
+       }
+       case Q_XGETQUOTA:
+       case Q_XGETNEXTQUOTA:
+               if (entering(tcp)) {
+                       printuid(", ", id);
+                       tprints(", ");
+
+                       return 0;
                }
-               case Q_GETINFO:
-                       if (entering(tcp))
-                               return 0;
-               case Q_SETINFO:
-               {
-                       struct if_dqinfo dq;
-
-                       if (umove_or_printaddr(tcp, data, &dq))
-                               break;
-                       tprintf("{bgrace=%" PRIu64 ", ", dq.dqi_bgrace);
-                       tprintf("igrace=%" PRIu64 ", ", dq.dqi_igrace);
-                       tprintf("flags=%#x, ", dq.dqi_flags);
-                       tprints("valid=");
-                       printflags(if_dqinfo_valid, dq.dqi_valid, "IIF_???");
-                       tprints("}");
-                       break;
+
+               ATTRIBUTE_FALLTHROUGH;
+       case Q_XSETQLIM:
+       {
+               struct xfs_dqblk dq;
+
+               if (entering(tcp)) {
+                       printuid(", ", id);
+                       tprints(", ");
                }
-               case Q_V2_GETINFO:
-                       if (entering(tcp))
-                               return 0;
-               case Q_V2_SETINFO:
-               {
-                       struct v2_dqinfo dq;
-
-                       if (umove_or_printaddr(tcp, data, &dq))
-                               break;
-                       tprintf("{bgrace=%u, ", dq.dqi_bgrace);
-                       tprintf("igrace=%u, ", dq.dqi_igrace);
-                       tprintf("flags=%#x, ", dq.dqi_flags);
-                       tprintf("blocks=%u, ", dq.dqi_blocks);
-                       tprintf("free_blk=%u, ", dq.dqi_free_blk);
-                       tprintf("free_entry=%u}", dq.dqi_free_entry);
+
+               if (umove_or_printaddr(tcp, data, &dq))
                        break;
+               PRINT_FIELD_D("{", dq, d_version);
+               PRINT_FIELD_FLAGS(", ", dq, d_flags,
+                                 xfs_dqblk_flags, "XFS_???_QUOTA");
+               PRINT_FIELD_X(", ", dq, d_fieldmask);
+               PRINT_FIELD_U(", ", dq, d_id);
+               PRINT_FIELD_U(", ", dq, d_blk_hardlimit);
+               PRINT_FIELD_U(", ", dq, d_blk_softlimit);
+               PRINT_FIELD_U(", ", dq, d_ino_hardlimit);
+               PRINT_FIELD_U(", ", dq, d_ino_softlimit);
+               PRINT_FIELD_U(", ", dq, d_bcount);
+               PRINT_FIELD_U(", ", dq, d_icount);
+               if (!abbrev(tcp)) {
+                       PRINT_FIELD_D(", ", dq, d_itimer);
+                       PRINT_FIELD_D(", ", dq, d_btimer);
+                       PRINT_FIELD_U(", ", dq, d_iwarns);
+                       PRINT_FIELD_U(", ", dq, d_bwarns);
+                       PRINT_FIELD_U(", ", dq, d_rtb_hardlimit);
+                       PRINT_FIELD_U(", ", dq, d_rtb_softlimit);
+                       PRINT_FIELD_U(", ", dq, d_rtbcount);
+                       PRINT_FIELD_D(", ", dq, d_rtbtimer);
+                       PRINT_FIELD_U(", ", dq, d_rtbwarns);
+               } else {
+                       tprints(", ...");
+               }
+               tprints("}");
+               break;
+       }
+       case Q_GETFMT:
+       {
+               uint32_t fmt;
+
+               if (entering(tcp)) {
+                       tprints(", ");
+
+                       return 0;
                }
-               case Q_V1_GETSTATS:
-               {
-                       struct v1_dqstats dq;
-
-                       if (entering(tcp))
-                               return 0;
-                       if (umove_or_printaddr(tcp, data, &dq))
-                               break;
-                       tprintf("{lookups=%u, ", dq.lookups);
-                       tprintf("drops=%u, ", dq.drops);
-                       tprintf("reads=%u, ", dq.reads);
-                       tprintf("writes=%u, ", dq.writes);
-                       tprintf("cache_hits=%u, ", dq.cache_hits);
-                       tprintf("allocated_dquots=%u, ", dq.allocated_dquots);
-                       tprintf("free_dquots=%u, ", dq.free_dquots);
-                       tprintf("syncs=%u}", dq.syncs);
+
+               if (umove_or_printaddr(tcp, data, &fmt))
                        break;
+               tprints("[");
+               printxval(quota_formats, fmt, "QFMT_VFS_???");
+               tprints("]");
+               break;
+       }
+       case Q_GETINFO:
+               if (entering(tcp)) {
+                       tprints(", ");
+
+                       return 0;
                }
-               case Q_V2_GETSTATS:
-               {
-                       struct v2_dqstats dq;
-
-                       if (entering(tcp))
-                               return 0;
-                       if (umove_or_printaddr(tcp, data, &dq))
-                               break;
-                       tprintf("{lookups=%u, ", dq.lookups);
-                       tprintf("drops=%u, ", dq.drops);
-                       tprintf("reads=%u, ", dq.reads);
-                       tprintf("writes=%u, ", dq.writes);
-                       tprintf("cache_hits=%u, ", dq.cache_hits);
-                       tprintf("allocated_dquots=%u, ", dq.allocated_dquots);
-                       tprintf("free_dquots=%u, ", dq.free_dquots);
-                       tprintf("syncs=%u, ", dq.syncs);
-                       tprintf("version=%u}", dq.version);
+
+               ATTRIBUTE_FALLTHROUGH;
+       case Q_SETINFO:
+       {
+               struct if_dqinfo dq;
+
+               if (entering(tcp))
+                       tprints(", ");
+
+               if (umove_or_printaddr(tcp, data, &dq))
                        break;
+               PRINT_FIELD_U("{", dq, dqi_bgrace);
+               PRINT_FIELD_U(", ", dq, dqi_igrace);
+               PRINT_FIELD_FLAGS(", ", dq, dqi_flags, if_dqinfo_flags, "DQF_???");
+               PRINT_FIELD_FLAGS(", ", dq, dqi_valid, if_dqinfo_valid, "IIF_???");
+               tprints("}");
+               break;
+       }
+       case Q_XGETQSTAT:
+       {
+               struct xfs_dqstats dq;
+
+               if (entering(tcp)) {
+                       tprints(", ");
+
+                       return 0;
                }
-               case Q_XGETQSTAT:
-               {
-                       struct xfs_dqstats dq;
-
-                       if (entering(tcp))
-                               return 0;
-                       if (umove_or_printaddr(tcp, data, &dq))
-                               break;
-                       tprintf("{version=%d, ", dq.qs_version);
-                       if (abbrev(tcp)) {
-                               tprints("...}");
-                               break;
+               if (fetch_struct_quotastat(tcp, data, &dq)) {
+                       PRINT_FIELD_D("{", dq, qs_version);
+                       if (!abbrev(tcp)) {
+                               PRINT_FIELD_FLAGS(", ", dq, qs_flags,
+                                                 xfs_quota_flags, "XFS_QUOTA_???");
+                               PRINT_FIELD_U(", qs_uquota={", dq.qs_uquota, qfs_ino);
+                               PRINT_FIELD_U(", ", dq.qs_uquota, qfs_nblks);
+                               PRINT_FIELD_U(", ", dq.qs_uquota, qfs_nextents);
+                               PRINT_FIELD_U("}, qs_gquota={", dq.qs_gquota, qfs_ino);
+                               PRINT_FIELD_U(", ", dq.qs_gquota, qfs_nblks);
+                               PRINT_FIELD_U(", ", dq.qs_gquota, qfs_nextents);
+                               PRINT_FIELD_U("}, ", dq, qs_incoredqs);
+                               PRINT_FIELD_D(", ", dq, qs_btimelimit);
+                               PRINT_FIELD_D(", ", dq, qs_itimelimit);
+                               PRINT_FIELD_D(", ", dq, qs_rtbtimelimit);
+                               PRINT_FIELD_U(", ", dq, qs_bwarnlimit);
+                               PRINT_FIELD_U(", ", dq, qs_iwarnlimit);
+                       } else {
+                               tprints(", ...");
                        }
-                       tprints("flags=");
-                       printflags(xfs_quota_flags,
-                                  dq.qs_flags, "XFS_QUOTA_???");
-                       tprintf(", incoredqs=%u, ", dq.qs_incoredqs);
-                       tprintf("u_ino=%" PRIu64 ", ", dq.qs_uquota.qfs_ino);
-                       tprintf("u_nblks=%" PRIu64 ", ", dq.qs_uquota.qfs_nblks);
-                       tprintf("u_nextents=%u, ", dq.qs_uquota.qfs_nextents);
-                       tprintf("g_ino=%" PRIu64 ", ", dq.qs_gquota.qfs_ino);
-                       tprintf("g_nblks=%" PRIu64 ", ", dq.qs_gquota.qfs_nblks);
-                       tprintf("g_nextents=%u, ", dq.qs_gquota.qfs_nextents);
-                       tprintf("btimelimit=%d, ", dq.qs_btimelimit);
-                       tprintf("itimelimit=%d, ", dq.qs_itimelimit);
-                       tprintf("rtbtimelimit=%d, ", dq.qs_rtbtimelimit);
-                       tprintf("bwarnlimit=%u, ", dq.qs_bwarnlimit);
-                       tprintf("iwarnlimit=%u}", dq.qs_iwarnlimit);
-                       break;
+                       tprints("}");
+               }
+               break;
+       }
+       case Q_XGETQSTATV:
+       {
+               struct fs_quota_statv dq;
+
+               if (entering(tcp)) {
+                       tprints(", ");
+
+                       return 0;
                }
-               case Q_XQUOTAON:
-               case Q_XQUOTAOFF:
-               {
-                       uint32_t flag;
-
-                       if (umove_or_printaddr(tcp, data, &flag))
-                               break;
-                       tprints("[");
-                       printflags(xfs_quota_flags, flag, "XFS_QUOTA_???");
-                       tprints("]");
+
+               if (umove_or_printaddr(tcp, data, &dq))
                        break;
+               PRINT_FIELD_D("{", dq, qs_version);
+               if (!abbrev(tcp)) {
+                       PRINT_FIELD_FLAGS(", ", dq, qs_flags,
+                                         xfs_quota_flags, "XFS_QUOTA_???");
+                       PRINT_FIELD_U(", ", dq, qs_incoredqs);
+                       PRINT_FIELD_U(", qs_uquota={", dq.qs_uquota, qfs_ino);
+                       PRINT_FIELD_U(", ", dq.qs_uquota, qfs_nblks);
+                       PRINT_FIELD_U(", ", dq.qs_uquota, qfs_nextents);
+                       PRINT_FIELD_U("}, qs_gquota={", dq.qs_gquota, qfs_ino);
+                       PRINT_FIELD_U(", ", dq.qs_gquota, qfs_nblks);
+                       PRINT_FIELD_U(", ", dq.qs_gquota, qfs_nextents);
+                       PRINT_FIELD_U("}, qs_pquota={", dq.qs_pquota, qfs_ino);
+                       PRINT_FIELD_U(", ", dq.qs_pquota, qfs_nblks);
+                       PRINT_FIELD_U(", ", dq.qs_pquota, qfs_nextents);
+                       PRINT_FIELD_D("}, ", dq, qs_btimelimit);
+                       PRINT_FIELD_D(", ", dq, qs_itimelimit);
+                       PRINT_FIELD_D(", ", dq, qs_rtbtimelimit);
+                       PRINT_FIELD_U(", ", dq, qs_bwarnlimit);
+                       PRINT_FIELD_U(", ", dq, qs_iwarnlimit);
+               } else {
+                       tprints(", ...");
                }
-               default:
-                       printaddr(data);
+               tprints("}");
+               break;
+       }
+       case Q_XQUOTAON:
+       case Q_XQUOTAOFF:
+       {
+               uint32_t flag;
+
+               tprints(", ");
+
+               if (umove_or_printaddr(tcp, data, &flag))
                        break;
+               tprints("[");
+               printflags(xfs_quota_flags, flag, "XFS_QUOTA_???");
+               tprints("]");
+               break;
+       }
+       case Q_XQUOTARM:
+       {
+               uint32_t flag;
+
+               tprints(", ");
+
+               if (umove_or_printaddr(tcp, data, &flag))
+                       break;
+               tprints("[");
+               printflags(xfs_dqblk_flags, flag, "XFS_???_QUOTA");
+               tprints("]");
+               break;
+       }
+       default:
+               printuid(", ", id);
+               tprints(", ");
+               printaddr(data);
+               break;
        }
        return RVAL_DECODED;
 }
 
+static void
+print_qcmd(const uint32_t qcmd)
+{
+       const uint32_t cmd = QCMD_CMD(qcmd);
+       const uint32_t type = QCMD_TYPE(qcmd);
+
+       if (xlat_verbose(xlat_verbosity) != XLAT_STYLE_ABBREV)
+               tprintf("%u", qcmd);
+
+       if (xlat_verbose(xlat_verbosity) == XLAT_STYLE_RAW)
+               return;
+
+       if (xlat_verbose(xlat_verbosity) == XLAT_STYLE_VERBOSE)
+               tprints(" /* ");
+
+       tprints("QCMD(");
+       printxvals_ex(cmd, "Q_???", XLAT_STYLE_ABBREV, quotacmds, NULL);
+       tprints(", ");
+       printxvals_ex(type, "???QUOTA", XLAT_STYLE_ABBREV, quotatypes, NULL);
+       tprints(")");
+
+       if (xlat_verbose(xlat_verbosity) == XLAT_STYLE_VERBOSE)
+               tprints(" */");
+}
+
 SYS_FUNC(quotactl)
 {
        /*
@@ -420,25 +429,12 @@ SYS_FUNC(quotactl)
         */
        uint32_t qcmd = tcp->u_arg[0];
        uint32_t cmd = QCMD_CMD(qcmd);
-       uint32_t type = QCMD_TYPE(qcmd);
        uint32_t id = tcp->u_arg[2];
 
        if (entering(tcp)) {
-               printxval(quotacmds, cmd, "Q_???");
-               tprints("|");
-               printxval(quotatypes, type, "???QUOTA");
+               print_qcmd(qcmd);
                tprints(", ");
                printpath(tcp, tcp->u_arg[1]);
-               tprints(", ");
-               switch (cmd) {
-                       case Q_QUOTAON:
-                       case Q_V1_QUOTAON:
-                               printxval(quota_formats, id, "QFMT_VFS_???");
-                               tprints(", ");
-                               printpath(tcp, tcp->u_arg[3]);
-                               return RVAL_DECODED;
-               }
-               tprintf("%u, ", id);
        }
-       return decode_cmd_data(tcp, cmd, tcp->u_arg[3]);
+       return decode_cmd_data(tcp, id, cmd, tcp->u_arg[3]);
 }