浏览代码

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: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Eric Sandeen 7 年之前
父节点
当前提交
e381a0f6c2
共有 5 个文件被更改,包括 7 次插入9 次删除
  1. 2 3
      fs/xfs/libxfs/xfs_dquot_buf.c
  2. 1 2
      fs/xfs/libxfs/xfs_quota_defs.h
  3. 1 1
      fs/xfs/xfs_dquot.c
  4. 2 2
      fs/xfs/xfs_log_recover.c
  5. 1 1
      fs/xfs/xfs_qm.c

+ 2 - 3
fs/xfs/libxfs/xfs_dquot_buf.c

@@ -47,8 +47,7 @@ xfs_dquot_verify(
 	struct xfs_mount *mp,
 	struct xfs_mount *mp,
 	xfs_disk_dquot_t *ddq,
 	xfs_disk_dquot_t *ddq,
 	xfs_dqid_t	 id,
 	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:
 	 * We can encounter an uninitialized dquot buffer for 2 reasons:
@@ -200,7 +199,7 @@ xfs_dquot_buf_verify(
 		if (i == 0)
 		if (i == 0)
 			id = be32_to_cpu(ddq->d_id);
 			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)
 		if (fa)
 			return fa;
 			return fa;
 	}
 	}

+ 1 - 2
fs/xfs/libxfs/xfs_quota_defs.h

@@ -152,8 +152,7 @@ typedef uint16_t	xfs_qwarncnt_t;
 #define XFS_QMOPT_RESBLK_MASK	(XFS_QMOPT_RES_REGBLKS | XFS_QMOPT_RES_RTBLKS)
 #define XFS_QMOPT_RESBLK_MASK	(XFS_QMOPT_RES_REGBLKS | XFS_QMOPT_RES_RTBLKS)
 
 
 extern xfs_failaddr_t xfs_dquot_verify(struct xfs_mount *mp,
 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_calc_dquots_per_chunk(unsigned int nbblks);
 extern int xfs_dquot_repair(struct xfs_mount *mp, struct xfs_disk_dquot *ddq,
 extern int xfs_dquot_repair(struct xfs_mount *mp, struct xfs_disk_dquot *ddq,
 		xfs_dqid_t id, uint type);
 		xfs_dqid_t id, uint type);

+ 1 - 1
fs/xfs/xfs_dquot.c

@@ -1001,7 +1001,7 @@ xfs_qm_dqflush(
 	/*
 	/*
 	 * A simple sanity check in case we got a corrupted dquot..
 	 * 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) {
 	if (fa) {
 		xfs_alert(mp, "corrupt dquot ID 0x%x in memory at %pS",
 		xfs_alert(mp, "corrupt dquot ID 0x%x in memory at %pS",
 				be32_to_cpu(ddqp->d_id), fa);
 				be32_to_cpu(ddqp->d_id), fa);

+ 2 - 2
fs/xfs/xfs_log_recover.c

@@ -2702,7 +2702,7 @@ xlog_recover_do_reg_buffer(
 				goto next;
 				goto next;
 			}
 			}
 			fa = xfs_dquot_verify(mp, item->ri_buf[i].i_addr,
 			fa = xfs_dquot_verify(mp, item->ri_buf[i].i_addr,
-					       -1, 0, 0);
+					       -1, 0);
 			if (fa) {
 			if (fa) {
 				xfs_alert(mp,
 				xfs_alert(mp,
 	"dquot corrupt at %pS trying to replay into block 0x%llx",
 	"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;
 	dq_f = item->ri_buf[0].i_addr;
 	ASSERT(dq_f);
 	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) {
 	if (fa) {
 		xfs_alert(mp, "corrupt dquot ID 0x%x in log at %pS",
 		xfs_alert(mp, "corrupt dquot ID 0x%x in log at %pS",
 				dq_f->qlf_id, fa);
 				dq_f->qlf_id, fa);

+ 1 - 1
fs/xfs/xfs_qm.c

@@ -865,7 +865,7 @@ xfs_qm_reset_dqcounts(
 		 * find uninitialised dquot blks. See comment in
 		 * find uninitialised dquot blks. See comment in
 		 * xfs_dquot_verify.
 		 * xfs_dquot_verify.
 		 */
 		 */
-		fa = xfs_dquot_verify(mp, ddq, id + j, type, 0);
+		fa = xfs_dquot_verify(mp, ddq, id + j, type);
 		if (fa)
 		if (fa)
 			xfs_dquot_repair(mp, ddq, id + j, type);
 			xfs_dquot_repair(mp, ddq, id + j, type);