Commit fd9e4cea authored Oct 20, 2016 by Darrick J. Wong Committed by Greg Kroah-Hartman Nov 10, 2016

libxfs: clean up _calc_dquots_per_chunk



commit 58d789678546d46d7bbd809dd7dab417c0f23655 upstream.

The function xfs_calc_dquots_per_chunk takes a parameter in units
of basic blocks.  The kernel seems to get the units wrong, but
userspace got 'fixed' by commenting out the unnecessary conversion.
Fix both.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 0daca12d

fs/xfs/libxfs/xfs_dquot_buf.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -191,8 +191,7 @@ xfs_dquot_buf_verify_crc(
		if (mp->m_quotainfo)
		ndquots = mp->m_quotainfo->qi_dqperchunk;
		else
		ndquots = xfs_calc_dquots_per_chunk(
		XFS_BB_TO_FSB(mp, bp->b_length));
		ndquots = xfs_calc_dquots_per_chunk(bp->b_length);

		for (i = 0; i < ndquots; i++, d++) {
		if (!xfs_verify_cksum((char *)d, sizeof(struct xfs_dqblk),