xfs: do not count metadata directory files when doing online quotacheck

Previously, we stated that files in the metadata directory tree are not
counted in the dquot information.  Fix the online quotacheck code to
reflect this.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/scrub/quotacheck.c b/fs/xfs/scrub/quotacheck.c
index c77eb2de8df71f51f8f63fd55cf037dcb224477c..dc4033b91e440b599d9894ed2829c6bca275822f 100644 (file)
--- a/fs/xfs/scrub/quotacheck.c
+++ b/fs/xfs/scrub/quotacheck.c
@@ -398,10 +398,13 @@ xqcheck_collect_inode(
        bool                    isreg = S_ISREG(VFS_I(ip)->i_mode);
        int                     error = 0;
 
-       if (xfs_is_quota_inode(&tp->t_mountp->m_sb, ip->i_ino)) {
+       if (xfs_is_metadir_inode(ip) ||
+           xfs_is_quota_inode(&tp->t_mountp->m_sb, ip->i_ino)) {
                /*
                 * Quota files are never counted towards quota, so we do not
-                * need to take the lock.
+                * need to take the lock.  Files do not switch between the
+                * metadata and regular directory trees without a reallocation,
+                * so we do not need to ILOCK them either.
                 */
                xchk_iscan_mark_visited(&xqc->iscan, ip);
                return 0;