[PATCH 3/5] xfs: xfs_iflush_cluster has range issues

Dave Chinner
2016-04-06T09:23:42Z

From: Dave Chinner <dchinner@redhat.com>

xfs_iflush_cluster() does a gang lookup on the radix tree, meaning
it can find inode beyond the current cluster if there is sparse
cache population. gang lookups return results in ascending index
order, so stop trying to cluster iodes once the first inode outside
the cluster mask is detected.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
fs/xfs/xfs_inode.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 6598104..b984be4 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -3194,11 +3194,20 @@ xfs_iflush_cluster(
*/
spin_lock(&cip->i_flags_lock);
if (!cip->i_ino ||
- __xfs_iflags_test(ip, XFS_ISTALE) ||
- (XFS_INO_TO_AGINO(mp, cip->i_ino) & mask) != first_index) {
+ __xfs_iflags_test(ip, XFS_ISTALE)) {
spin_unlock(&cip->i_flags_lock);
continue;
}
+
+ /*
+ * Once we fall off the end of the cluster, no point checking
+ * any more inodes in the list because they will also all be
+ * outside the cluster.
+ */
+ if ((XFS_INO_TO_AGINO(mp, cip->i_ino) & mask) != first_index) {
+ spin_unlock(&cip->i_flags_lock);
+ break;
+ }
spin_unlock(&cip->i_flags_lock);

/*
--
2.7.0