| Message ID | e54544bf-9662-fa91-40b6-69a284aa66e2@sandeen.net (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Apr 19, 2017 at 02:41:07PM -0500, Eric Sandeen wrote: > The kbuild test robot caught this; in debug code we have another > caller of do_div with a 32-bit dividend (j) which is caught now > that we are using the kernel-supplied do_div. > > None of the values used here are 64-bit; just use simple division. > > Signed-off-by: Eric Sandeen <sandeen@redhat.com> Looks ok, will throw it on the testing pile... Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> (Seems to build ok on i386 too.) --D > --- > > V2: now with less actual 64-bit division! > > diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c > index b669b12..6b42db4 100644 > --- a/fs/xfs/xfs_qm.c > +++ b/fs/xfs/xfs_qm.c > @@ -851,8 +851,8 @@ struct xfs_qm_isolate { > * started afresh by xfs_qm_quotacheck. > */ > #ifdef DEBUG > - j = XFS_FSB_TO_B(mp, XFS_DQUOT_CLUSTER_SIZE_FSB); > - do_div(j, sizeof(xfs_dqblk_t)); > + j = (int)XFS_FSB_TO_B(mp, XFS_DQUOT_CLUSTER_SIZE_FSB) / > + sizeof(xfs_dqblk_t); > ASSERT(mp->m_quotainfo->qi_dqperchunk == j); > #endif > dqb = bp->b_addr; > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Apr 19, 2017 at 02:41:07PM -0500, Eric Sandeen wrote: > The kbuild test robot caught this; in debug code we have another > caller of do_div with a 32-bit dividend (j) which is caught now > that we are using the kernel-supplied do_div. > > None of the values used here are 64-bit; just use simple division. > > Signed-off-by: Eric Sandeen <sandeen@redhat.com> looks even better now ;) Reviewed-by: Bill O'Donnell > --- > > V2: now with less actual 64-bit division! > > diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c > index b669b12..6b42db4 100644 > --- a/fs/xfs/xfs_qm.c > +++ b/fs/xfs/xfs_qm.c > @@ -851,8 +851,8 @@ struct xfs_qm_isolate { > * started afresh by xfs_qm_quotacheck. > */ > #ifdef DEBUG > - j = XFS_FSB_TO_B(mp, XFS_DQUOT_CLUSTER_SIZE_FSB); > - do_div(j, sizeof(xfs_dqblk_t)); > + j = (int)XFS_FSB_TO_B(mp, XFS_DQUOT_CLUSTER_SIZE_FSB) / > + sizeof(xfs_dqblk_t); > ASSERT(mp->m_quotainfo->qi_dqperchunk == j); > #endif > dqb = bp->b_addr; > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Apr 19, 2017 at 02:41:07PM -0500, Eric Sandeen wrote: > The kbuild test robot caught this; in debug code we have another > caller of do_div with a 32-bit dividend (j) which is caught now > that we are using the kernel-supplied do_div. > > None of the values used here are 64-bit; just use simple division. > > Signed-off-by: Eric Sandeen <sandeen@redhat.com> reviewed again, this time with proper email sig. ;) Reviewed-by: Bill O'Donnell <billodo@redhat.com> > --- > > V2: now with less actual 64-bit division! > > diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c > index b669b12..6b42db4 100644 > --- a/fs/xfs/xfs_qm.c > +++ b/fs/xfs/xfs_qm.c > @@ -851,8 +851,8 @@ struct xfs_qm_isolate { > * started afresh by xfs_qm_quotacheck. > */ > #ifdef DEBUG > - j = XFS_FSB_TO_B(mp, XFS_DQUOT_CLUSTER_SIZE_FSB); > - do_div(j, sizeof(xfs_dqblk_t)); > + j = (int)XFS_FSB_TO_B(mp, XFS_DQUOT_CLUSTER_SIZE_FSB) / > + sizeof(xfs_dqblk_t); > ASSERT(mp->m_quotainfo->qi_dqperchunk == j); > #endif > dqb = bp->b_addr; > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index b669b12..6b42db4 100644 --- a/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c @@ -851,8 +851,8 @@ struct xfs_qm_isolate { * started afresh by xfs_qm_quotacheck. */ #ifdef DEBUG - j = XFS_FSB_TO_B(mp, XFS_DQUOT_CLUSTER_SIZE_FSB); - do_div(j, sizeof(xfs_dqblk_t)); + j = (int)XFS_FSB_TO_B(mp, XFS_DQUOT_CLUSTER_SIZE_FSB) / + sizeof(xfs_dqblk_t); ASSERT(mp->m_quotainfo->qi_dqperchunk == j); #endif dqb = bp->b_addr;
The kbuild test robot caught this; in debug code we have another caller of do_div with a 32-bit dividend (j) which is caught now that we are using the kernel-supplied do_div. None of the values used here are 64-bit; just use simple division. Signed-off-by: Eric Sandeen <sandeen@redhat.com> --- V2: now with less actual 64-bit division! -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html