1 files changed, 7 insertions, 6 deletions

diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index bb502a391792..1790b00bea7a 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -1488,6 +1488,7 @@ xfs_buf_iomove(
 static enum lru_status
 xfs_buftarg_wait_rele(
         struct list_head        *item,
+        struct list_lru_one     *lru,
         spinlock_t              *lru_lock,
         void                    *arg)
 
@@ -1509,7 +1510,7 @@ xfs_buftarg_wait_rele(
          */
         atomic_set(&bp->b_lru_ref, 0);
         bp->b_state |= XFS_BSTATE_DISPOSE;
-        list_move(item, dispose);
+        list_lru_isolate_move(lru, item, dispose);
         spin_unlock(&bp->b_lock);
         return LRU_REMOVED;
 }
@@ -1546,6 +1547,7 @@ xfs_wait_buftarg(
 static enum lru_status
 xfs_buftarg_isolate(
         struct list_head        *item,
+        struct list_lru_one     *lru,
         spinlock_t              *lru_lock,
         void                    *arg)
 {
@@ -1569,7 +1571,7 @@ xfs_buftarg_isolate(
         }
 
         bp->b_state |= XFS_BSTATE_DISPOSE;
-        list_move(item, dispose);
+        list_lru_isolate_move(lru, item, dispose);
         spin_unlock(&bp->b_lock);
         return LRU_REMOVED;
 }
@@ -1583,10 +1585,9 @@ xfs_buftarg_shrink_scan(
                                         struct xfs_buftarg, bt_shrinker);
         LIST_HEAD(dispose);
         unsigned long           freed;
-        unsigned long           nr_to_scan = sc->nr_to_scan;
 
-        freed = list_lru_walk_node(&btp->bt_lru, sc->nid, xfs_buftarg_isolate,
-                                       &dispose, &nr_to_scan);
+        freed = list_lru_shrink_walk(&btp->bt_lru, sc,
+                                     xfs_buftarg_isolate, &dispose);
 
         while (!list_empty(&dispose)) {
                 struct xfs_buf *bp;
@@ -1605,7 +1606,7 @@ xfs_buftarg_shrink_count(
 {
         struct xfs_buftarg      *btp = container_of(shrink,
                                         struct xfs_buftarg, bt_shrinker);
-        return list_lru_count_node(&btp->bt_lru, sc->nid);
+        return list_lru_shrink_count(&btp->bt_lru, sc);
 }
 
 void