summaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-02-07 14:07:57 -0800
committerDarrick J. Wong <darrick.wong@oracle.com>2017-02-09 11:36:39 -0800
commit46694129816851cb323e4bcf2dc41482d8d6c19b (patch)
tree5555850ba16c4921005d8cab9f523158434be0de /fs/xfs
parentebf55872616c7d4754db5a318591a72a8d5e6896 (diff)
downloadlinux-stable-46694129816851cb323e4bcf2dc41482d8d6c19b.tar.gz
linux-stable-46694129816851cb323e4bcf2dc41482d8d6c19b.tar.bz2
linux-stable-46694129816851cb323e4bcf2dc41482d8d6c19b.zip
xfs: improve busy extent sorting
Sort busy extents by the full block number instead of just the AGNO so that we can issue consecutive discard requests that the block layer could merge (although we'll need additional block layer fixes for fast devices). Signed-off-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>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/xfs_extent_busy.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/fs/xfs/xfs_extent_busy.c b/fs/xfs/xfs_extent_busy.c
index 4d850e27095e..ab062610234e 100644
--- a/fs/xfs/xfs_extent_busy.c
+++ b/fs/xfs/xfs_extent_busy.c
@@ -656,9 +656,17 @@ xfs_extent_busy_wait_all(
int
xfs_extent_busy_ag_cmp(
void *priv,
- struct list_head *a,
- struct list_head *b)
+ struct list_head *l1,
+ struct list_head *l2)
{
- return container_of(a, struct xfs_extent_busy, list)->agno -
- container_of(b, struct xfs_extent_busy, list)->agno;
+ struct xfs_extent_busy *b1 =
+ container_of(l1, struct xfs_extent_busy, list);
+ struct xfs_extent_busy *b2 =
+ container_of(l2, struct xfs_extent_busy, list);
+ s32 diff;
+
+ diff = b1->agno - b2->agno;
+ if (!diff)
+ diff = b1->bno - b2->bno;
+ return diff;
}