[Top] [All Lists]

[PATCH] don't use signed int to store xfs_dqid_t

To: xfs@xxxxxxxxxxx, xfs-dev <xfs-dev@xxxxxxx>
Subject: [PATCH] don't use signed int to store xfs_dqid_t
From: Peter Leckie <pleckie@xxxxxxx>
Date: Wed, 24 Sep 2008 14:47:15 +1000
User-agent: Thunderbird (X11/20070305)
When running xfsqa test 144 with quota's enabled it's possible to
trip the following ASSERT(curid >= 0); from xfs_qm_init_dquot_blk().
The reason this assert was tripped is the signed int currid was assigned
an id from the unsigned xfs_dqid_t this works as long as the MSB in xfs_dqid_t
is not set. However if it is this translates to a negative number causing
the assert to trip.

The fix for this is simply replacing the signed int with type xfs_dqid_t
and since xfs_dqid_t is unsigned there is no point checking if it's negative
so remove the assert.

Index: 2.6.x-xfs/fs/xfs/quota/xfs_dquot.c
--- 2.6.x-xfs.orig/fs/xfs/quota/xfs_dquot.c 2008-09-24 12:02:41.000000000 +1000
+++ 2.6.x-xfs/fs/xfs/quota/xfs_dquot.c  2008-09-24 14:31:18.374406815 +1000
@@ -370,7 +370,8 @@ xfs_qm_init_dquot_blk(
       xfs_buf_t       *bp)
       xfs_dqblk_t     *d;
-       int             curid, i;
+       xfs_dqid_t      curid;
+       int              i;

@@ -382,7 +383,6 @@ xfs_qm_init_dquot_blk(
        * ID of the first dquot in the block - id's are zero based.
       curid = id - (id % XFS_QM_DQPERBLK(mp));
-       ASSERT(curid >= 0);
       memset(d, 0, BBTOB(XFS_QI_DQCHUNKLEN(mp)));
       for (i = 0; i < XFS_QM_DQPERBLK(mp); i++, d++, curid++)
               xfs_qm_dqinit_core(curid, type, d);

<Prev in Thread] Current Thread [Next in Thread>