Resolve quota-related uid/gid signedness issues in userspace tools.

Merge of master-melb:xfs-cmds:23841a by kenmcd.

diff --git a/db/check.c b/db/check.c
index f45348ab9ece8dec0cdbc5703f559b5ebf6a33c3..d235c1c1ecd41bc400cc6c9ec4f2fe7252168b3e 100644 (file)
--- a/db/check.c
+++ b/db/check.c
@@ -331,7 +331,7 @@ static xfs_ino_t    process_sf_dir_v2(xfs_dinode_t *dip, int *dot,
                                          int *dotdot, inodata_t *id);
 static xfs_ino_t       process_shortform_dir_v1(xfs_dinode_t *dip, int *dot,
                                                 int *dotdot, inodata_t *id);
-static void            quota_add(xfs_dqid_t p, xfs_dqid_t g, xfs_dqid_t u,
+static void            quota_add(xfs_dqid_t *p, xfs_dqid_t *g, xfs_dqid_t *u,
                                  int dq, xfs_qcnt_t bc, xfs_qcnt_t ic,
                                  xfs_qcnt_t rc);
 static void            quota_add1(qdata_t **qt, xfs_dqid_t id, int dq,
@@ -2611,6 +2611,7 @@ process_inode(
        xfs_qcnt_t              bc = 0;
        xfs_qcnt_t              ic = 0;
        xfs_qcnt_t              rc = 0;
+       xfs_dqid_t              dqprid;
        static char             okfmts[] = {
                0,                              /* type 0 unused */
                1 << XFS_DINODE_FMT_DEV,        /* FIFO */
@@ -2825,9 +2826,11 @@ process_inode(
                default:
                        break;
                }
-               if (ic)
-                       quota_add(dic->di_projid, dic->di_gid, dic->di_uid,
+               if (ic) {
+                       dqprid = dic->di_projid;        /* dquot ID is u32 */
+                       quota_add(&dqprid, &dic->di_gid, &dic->di_uid,
                                  0, bc, ic, rc);
+               }
        }
        totblocks = totdblocks + totiblocks + atotdblocks + atotiblocks;
        if (totblocks != dic->di_nblocks) {
@@ -3377,8 +3380,8 @@ process_quota(
        xfs_dqblk_t     *dqb;
        xfs_dqid_t      dqid;
        u_int8_t        exp_flags = 0;
-       int             i;
-       int             perblock;
+       uint            i;
+       uint            perblock;
        xfs_fileoff_t   qbno;
        char            *s = NULL;
        int             scicb;
@@ -3401,7 +3404,7 @@ process_quota(
                ASSERT(0);
        }
 
-       perblock = (int)(mp->m_sb.sb_blocksize / sizeof(*dqb));
+       perblock = (uint)(mp->m_sb.sb_blocksize / sizeof(*dqb));
        dqid = 0;
        qbno = NULLFILEOFF;
        while ((qbno = blkmap_next_off(blkmap, qbno, &t)) !=
@@ -3425,7 +3428,7 @@ process_quota(
                }
                for (i = 0; i < perblock; i++, dqid++, dqb++) {
                        if (verbose || id->ilist || cb)
-                               dbprintf("%s dqblk %lld entry %d id %d bc "
+                               dbprintf("%s dqblk %lld entry %d id %u bc "
                                         "%lld ic %lld rc %lld\n",
                                        s, (xfs_dfiloff_t)qbno, i, dqid,
                                        INT_GET(dqb->dd_diskdq.d_bcount, ARCH_CONVERT),
@@ -3434,7 +3437,7 @@ process_quota(
                        if (INT_GET(dqb->dd_diskdq.d_magic, ARCH_CONVERT) != XFS_DQUOT_MAGIC) {
                                if (scicb)
                                        dbprintf("bad magic number %#x for %s "
-                                                "dqblk %lld entry %d id %d\n",
+                                                "dqblk %lld entry %d id %u\n",
                                                INT_GET(dqb->dd_diskdq.d_magic, ARCH_CONVERT), s,
                                                (xfs_dfiloff_t)qbno, i, dqid);
                                error++;
@@ -3444,7 +3447,7 @@ process_quota(
                                if (scicb)
                                        dbprintf("bad version number %#x for "
                                                 "%s dqblk %lld entry %d id "
-                                                "%d\n",
+                                                "%u\n",
                                                INT_GET(dqb->dd_diskdq.d_version, ARCH_CONVERT), s,
                                                (xfs_dfiloff_t)qbno, i, dqid);
                                error++;
@@ -3453,7 +3456,7 @@ process_quota(
                        if (INT_GET(dqb->dd_diskdq.d_flags, ARCH_CONVERT) != exp_flags) {
                                if (scicb)
                                        dbprintf("bad flags %#x for %s dqblk "
-                                                "%lld entry %d id %d\n",
+                                                "%lld entry %d id %u\n",
                                                INT_GET(dqb->dd_diskdq.d_flags, ARCH_CONVERT), s,
                                                (xfs_dfiloff_t)qbno, i, dqid);
                                error++;
@@ -3461,16 +3464,16 @@ process_quota(
                        }
                        if (INT_GET(dqb->dd_diskdq.d_id, ARCH_CONVERT) != dqid) {
                                if (scicb)
-                                       dbprintf("bad id %d for %s dqblk %lld "
-                                                "entry %d id %d\n",
+                                       dbprintf("bad id %u for %s dqblk %lld "
+                                                "entry %d id %u\n",
                                                INT_GET(dqb->dd_diskdq.d_id, ARCH_CONVERT), s,
                                                (xfs_dfiloff_t)qbno, i, dqid);
                                error++;
                                continue;
                        }
-                       quota_add((qtype == IS_PROJECT_QUOTA) ? dqid : -1,
-                                 (qtype == IS_GROUP_QUOTA) ? dqid : -1,
-                                 (qtype == IS_USER_QUOTA) ? dqid : -1,
+                       quota_add((qtype == IS_PROJECT_QUOTA) ? &dqid : NULL,
+                                 (qtype == IS_GROUP_QUOTA) ? &dqid : NULL,
+                                 (qtype == IS_USER_QUOTA) ? &dqid : NULL,
                                  1,
                                  INT_GET(dqb->dd_diskdq.d_bcount, ARCH_CONVERT),
                                  INT_GET(dqb->dd_diskdq.d_icount, ARCH_CONVERT),
@@ -3768,20 +3771,20 @@ process_shortform_dir_v1(
 
 static void
 quota_add(
-       xfs_dqid_t      prjid,
-       xfs_dqid_t      grpid,
-       xfs_dqid_t      usrid,
+       xfs_dqid_t      *prjid,
+       xfs_dqid_t      *grpid,
+       xfs_dqid_t      *usrid,
        int             dq,
        xfs_qcnt_t      bc,
        xfs_qcnt_t      ic,
        xfs_qcnt_t      rc)
 {
-       if (qudo && usrid != -1)
-               quota_add1(qudata, usrid, dq, bc, ic, rc);
-       if (qgdo && grpid != -1)
-               quota_add1(qgdata, grpid, dq, bc, ic, rc);
-       if (qpdo && prjid != -1)
-               quota_add1(qpdata, prjid, dq, bc, ic, rc);
+       if (qudo && usrid != NULL)
+               quota_add1(qudata, *usrid, dq, bc, ic, rc);
+       if (qgdo && grpid != NULL)
+               quota_add1(qgdata, *grpid, dq, bc, ic, rc);
+       if (qpdo && prjid != NULL)
+               quota_add1(qpdata, *prjid, dq, bc, ic, rc);
 }
 
 static void
@@ -3797,7 +3800,7 @@ quota_add1(
        int             qh;
        qinfo_t         *qi;
 
-       qh = (int)((__uint32_t)id % QDATA_HASH_SIZE);
+       qh = (int)(id % QDATA_HASH_SIZE);
        qe = qt[qh];
        while (qe) {
                if (qe->id == id) {
@@ -3838,7 +3841,7 @@ quota_check(
                            qp->count.ic != qp->dq.ic ||
                            qp->count.rc != qp->dq.rc) {
                                if (!sflag) {
-                                       dbprintf("%s quota id %d, have/exp",
+                                       dbprintf("%s quota id %u, have/exp",
                                                s, qp->id);
                                        if (qp->count.bc != qp->dq.bc)
                                                dbprintf(" bc %lld/%lld",

diff --git a/db/dquot.c b/db/dquot.c
index 9eb434c82e0225c1be15500f75b19fdbecef91f6..e97c4b4357ee400a489bf837b177fec5f06ca8ea 100644 (file)
--- a/db/dquot.c
+++ b/db/dquot.c
@@ -157,7 +157,7 @@ dquot_f(
                return 0;
        }
        perblock = (int)(mp->m_sb.sb_blocksize / sizeof(xfs_dqblk_t));
-       qbno = (xfs_fileoff_t)(id / perblock);
+       qbno = (xfs_fileoff_t)id / perblock;
        qoff = (int)(id % perblock);
        push_cur();
        set_cur_inode(ino);

diff --git a/include/xfs_quota.h b/include/xfs_quota.h
index 9fe0644a2ca55a0cdeafca53758a8ff91cdd9ddf..f1e1fc15b3cd0b736d8965335fe0cf7b3410a0ce 100644 (file)
--- a/include/xfs_quota.h
+++ b/include/xfs_quota.h
@@ -42,7 +42,7 @@
  * uid_t and gid_t are hard-coded to 32 bits in the inode.
  * Hence, an 'id' in a dquot is 32 bits..
  */
-typedef __int32_t      xfs_dqid_t;
+typedef __uint32_t     xfs_dqid_t;
 
 /*
  * Eventhough users may not have quota limits occupying all 64-bits,