xfs: flush inode inactivation work when compiling usage statistics

Users have come to expect that the space accounting information in
statfs and getquota reports are fairly accurate.  Now that we inactivate
inodes from a background queue, these numbers can be thrown off by
whatever resources are singly-owned by the inodes in the queue.  Flush
the pending inactivations when userspace asks for a space usage report.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>

diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index 982cd6613a4cfdbd069d2b8ef3459e3b74211b6f..c6902f9d064c6d5cc7b98906194d44b5ba544d77 100644 (file)
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -481,6 +481,10 @@ xfs_qm_scall_getquota(
        struct xfs_dquot        *dqp;
        int                     error;
 
+       /* Flush inodegc work at the start of a quota reporting scan. */
+       if (id == 0)
+               xfs_inodegc_flush(mp);
+
        /*
         * Try to get the dquot. We don't want it allocated on disk, so don't
         * set doalloc. If it doesn't exist, we'll get ENOENT back.
@@ -519,6 +523,10 @@ xfs_qm_scall_getquota_next(
        struct xfs_dquot        *dqp;
        int                     error;
 
+       /* Flush inodegc work at the start of a quota reporting scan. */
+       if (*id == 0)
+               xfs_inodegc_flush(mp);
+
        error = xfs_qm_dqget_next(mp, *id, type, &dqp);
        if (error)
                return error;

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index fd39b97c7bb49456010d5912ddf1a72c37fa999d..d142aaaa50ef8620cfb63ebdfd1ea359e258199c 100644 (file)
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -785,6 +785,9 @@ xfs_fs_statfs(
        xfs_extlen_t            lsize;
        int64_t                 ffree;
 
+       /* Wait for whatever inactivations are in progress. */
+       xfs_inodegc_flush(mp);
+
        statp->f_type = XFS_SUPER_MAGIC;
        statp->f_namelen = MAXNAMELEN - 1;