On Wed, Jan 20, 2016 at 05:43:48PM -0600, Eric Sandeen wrote: > Quota IDs are unsigned, and so we can pass in values up > to 2^32-1. But if we try to initialize a block containing > values over MAX_INT, curid will overflow and assert. > > curid holds a quota ID, so give it the proper > xfs_dqid_t type (and remove the now-impossible ASSERT). > > Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx> > --- Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx> > > diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c > index 83ce4aa..5d92bb5 100644 > --- a/fs/xfs/xfs_dquot.c > +++ b/fs/xfs/xfs_dquot.c > @@ -232,7 +232,8 @@ xfs_qm_init_dquot_blk( > { > struct xfs_quotainfo *q = mp->m_quotainfo; > xfs_dqblk_t *d; > - int curid, i; > + xfs_dqid_t curid; > + int i; > > ASSERT(tp); > ASSERT(xfs_buf_islocked(bp)); > @@ -243,7 +244,6 @@ xfs_qm_init_dquot_blk( > * ID of the first dquot in the block - id's are zero based. > */ > curid = id - (id % q->qi_dqperchunk); > - ASSERT(curid >= 0); > memset(d, 0, BBTOB(q->qi_dqchunklen)); > for (i = 0; i < q->qi_dqperchunk; i++, d++, curid++) { > d->dd_diskdq.d_magic = cpu_to_be16(XFS_DQUOT_MAGIC); > > _______________________________________________ > xfs mailing list > xfs@xxxxxxxxxxx > http://oss.sgi.com/mailman/listinfo/xfs _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs