xfs: remove unused flags arg from xfs_dquot_verify

Source kernel commit: e381a0f6c28a3f2a452d5fba9b917f03e5dc4ffb

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>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_dquot_buf.c b/libxfs/xfs_dquot_buf.c
index 43134e291ae2a6f95d7b5e602820422a47385445..1486b2bd98f08d2829550cc9cef6d347f24c3185 100644 (file)
--- a/libxfs/xfs_dquot_buf.c
+++ b/libxfs/xfs_dquot_buf.c
@@ -45,8 +45,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:
@@ -198,7 +197,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/libxfs/xfs_quota_defs.h b/libxfs/xfs_quota_defs.h
index 067475e2674ace1f356962d19c712f7b8db98b2e..eeccffec30e45436ef5e4e8cce5ec63c4d8bc65b 100644 (file)
--- a/libxfs/xfs_quota_defs.h
+++ b/libxfs/xfs_quota_defs.h
@@ -154,8 +154,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/repair/dinode.c b/repair/dinode.c
index 72e09cc994a866bfd678f1190d6be5dc9811fd9e..de89c0f40c7912848c05c86f70270f28463fed0b 100644 (file)
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -1399,7 +1399,7 @@ _("cannot read inode %" PRIu64 ", file block %" PRIu64 ", disk block %" PRIu64 "
                                }
                        }
                        if (libxfs_dquot_verify(mp, &dqb->dd_diskdq, dqid,
-                                               quota_type, 0) != NULL) {
+                                               quota_type) != NULL) {
                                do_warn(_("%s: Corrupt quota for id %u. "),
                                                quota_string, dqid);
                                bad_dqb = 1;