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>

diff --git a/fs/xfs/libxfs/xfs_dquot_buf.c b/fs/xfs/libxfs/xfs_dquot_buf.c
index 8b7a6c3cb5997a8162f9e434b1e5a3a0b7973380..a926058f7b0cd83137e4daf5bdf194440c688eb5 100644 (file)
--- a/fs/xfs/libxfs/xfs_dquot_buf.c
+++ b/fs/xfs/libxfs/xfs_dquot_buf.c
@@ -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;
        }

diff --git a/fs/xfs/libxfs/xfs_quota_defs.h b/fs/xfs/libxfs/xfs_quota_defs.h
index bb1b13a9b5f48b445e6585231f53893ec4f0d45a..8433656af0da83d3a76821cdc0e0d574a613e83a 100644 (file)
--- a/fs/xfs/libxfs/xfs_quota_defs.h
+++ b/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)
 
 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);

diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index a7daef9e16bfb14a818148692692cfc801754f48..8d378f48526089e000f143e712920a991d613e8d 100644 (file)
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -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);

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 2b2383f1895ef24a2718f673c2d433399cbeb16e..06a09cb948b529bbf8506186bafbe23ccdcc775e 100644 (file)
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -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);

diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index afb991283b12dffb7f5a1aa8db77096c26cd1bc7..e641a507d0edfbc741b219e4e8c593ca7158db33 100644 (file)
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -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);