Commit e381a0f6 authored by Eric Sandeen's avatar Eric Sandeen Committed by Darrick J. Wong
Browse files

xfs: remove unused flags arg from xfs_dquot_verify 



Long ago the flags argument was used to determine whether to issue warnings
about corruptions, but that's done elsewhere now and the flag is unused
here, so remove it.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent dfa03a5f

fs/xfs/libxfs/xfs_dquot_buf.c

+2 −3
Original line number Diff line number Diff line
@@ -47,8 +47,7 @@ xfs_dquot_verify( 
	struct xfs_mount *mp,

	xfs_disk_dquot_t *ddq,

	xfs_dqid_t	 id,

	uint		 type,	  /* used only when IO_dorepair is true */

	uint		 flags)

	uint		 type)	  /* used only when IO_dorepair is true */

{

	/*

	 * We can encounter an uninitialized dquot buffer for 2 reasons:
@@ -200,7 +199,7 @@ xfs_dquot_buf_verify( 
		if (i == 0)

			id = be32_to_cpu(ddq->d_id);



		fa = xfs_dquot_verify(mp, ddq, id + i, 0, 0);

		fa = xfs_dquot_verify(mp, ddq, id + i, 0);

		if (fa)

			return fa;

	}

fs/xfs/libxfs/xfs_quota_defs.h

+1 −2
Original line number Diff line number Diff line
@@ -152,8 +152,7 @@ typedef uint16_t xfs_qwarncnt_t; 
#define XFS_QMOPT_RESBLK_MASK	(XFS_QMOPT_RES_REGBLKS | XFS_QMOPT_RES_RTBLKS)



extern xfs_failaddr_t xfs_dquot_verify(struct xfs_mount *mp,

		struct xfs_disk_dquot *ddq, xfs_dqid_t id, uint type,

		uint flags);

		struct xfs_disk_dquot *ddq, xfs_dqid_t id, uint type);

extern int xfs_calc_dquots_per_chunk(unsigned int nbblks);

extern int xfs_dquot_repair(struct xfs_mount *mp, struct xfs_disk_dquot *ddq,

		xfs_dqid_t id, uint type);

fs/xfs/xfs_dquot.c

+1 −1
Original line number Diff line number Diff line
@@ -1001,7 +1001,7 @@ xfs_qm_dqflush( 
	/*

	 * A simple sanity check in case we got a corrupted dquot..

	 */

	fa = xfs_dquot_verify(mp, &dqp->q_core, be32_to_cpu(ddqp->d_id), 0, 0);

	fa = xfs_dquot_verify(mp, &dqp->q_core, be32_to_cpu(ddqp->d_id), 0);

	if (fa) {

		xfs_alert(mp, "corrupt dquot ID 0x%x in memory at %pS",

				be32_to_cpu(ddqp->d_id), fa);

fs/xfs/xfs_log_recover.c

+2 −2
Original line number Diff line number Diff line
@@ -2702,7 +2702,7 @@ xlog_recover_do_reg_buffer( 
				goto next;

			}

			fa = xfs_dquot_verify(mp, item->ri_buf[i].i_addr,

					       -1, 0, 0);

					       -1, 0);

			if (fa) {

				xfs_alert(mp,

	"dquot corrupt at %pS trying to replay into block 0x%llx",
@@ -3348,7 +3348,7 @@ xlog_recover_dquot_pass2( 
	 */

	dq_f = item->ri_buf[0].i_addr;

	ASSERT(dq_f);

	fa = xfs_dquot_verify(mp, recddq, dq_f->qlf_id, 0, 0);

	fa = xfs_dquot_verify(mp, recddq, dq_f->qlf_id, 0);

	if (fa) {

		xfs_alert(mp, "corrupt dquot ID 0x%x in log at %pS",

				dq_f->qlf_id, fa);

fs/xfs/xfs_qm.c

+1 −1
Original line number Diff line number Diff line
@@ -865,7 +865,7 @@ xfs_qm_reset_dqcounts( 
		 * find uninitialised dquot blks. See comment in

		 * xfs_dquot_verify.

		 */

		fa = xfs_dquot_verify(mp, ddq, id + j, type, 0);

		fa = xfs_dquot_verify(mp, ddq, id + j, type);

		if (fa)

			xfs_dquot_repair(mp, ddq, id + j, type);

CRA Git | Maintained and supported by SUSTech CRA and CCSE