Merge branch 'akpm' (patches from Andrew)

Merge third set of updates from Andrew Morton:

 - the rest of MM

   [ This includes getting rid of the numa hinting bits, in favor of
     just generic protnone logic.  Yay.     - Linus ]

 - core kernel

 - procfs

 - some of lib/ (lots of lib/ material this time)

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (104 commits)
  lib/lcm.c: replace include
  lib/percpu_ida.c: remove redundant includes
  lib/strncpy_from_user.c: replace module.h include
  lib/stmp_device.c: replace module.h include
  lib/sort.c: move include inside #if 0
  lib/show_mem.c: remove redundant include
  lib/radix-tree.c: change to simpler include
  lib/plist.c: remove redundant include
  lib/nlattr.c: remove redundant include
  lib/kobject_uevent.c: remove redundant include
  lib/llist.c: remove redundant include
  lib/md5.c: simplify include
  lib/list_sort.c: rearrange includes
  lib/genalloc.c: remove redundant include
  lib/idr.c: remove redundant include
  lib/halfmd4.c: simplify includes
  lib/dynamic_queue_limits.c: simplify includes
  lib/sort.c: use simpler includes
  lib/interval_tree.c: simplify includes
  hexdump: make it return number of bytes placed in buffer
  ...

3 files changed, 16 insertions, 16 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
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index 3e8186279541..53cc2aaf8d2b 100644
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -430,6 +430,7 @@ struct xfs_qm_isolate {
 static enum lru_status
 xfs_qm_dquot_isolate(
         struct list_head        *item,
+        struct list_lru_one     *lru,
         spinlock_t              *lru_lock,
         void                    *arg)
                 __releases(lru_lock) __acquires(lru_lock)
@@ -450,7 +451,7 @@ xfs_qm_dquot_isolate(
                 XFS_STATS_INC(xs_qm_dqwants);
 
                 trace_xfs_dqreclaim_want(dqp);
-                list_del_init(&dqp->q_lru);
+                list_lru_isolate(lru, &dqp->q_lru);
                 XFS_STATS_DEC(xs_qm_dquot_unused);
                 return LRU_REMOVED;
         }
@@ -494,7 +495,7 @@ xfs_qm_dquot_isolate(
         xfs_dqunlock(dqp);
 
         ASSERT(dqp->q_nrefs == 0);
-        list_move_tail(&dqp->q_lru, &isol->dispose);
+        list_lru_isolate_move(lru, &dqp->q_lru, &isol->dispose);
         XFS_STATS_DEC(xs_qm_dquot_unused);
         trace_xfs_dqreclaim_done(dqp);
         XFS_STATS_INC(xs_qm_dqreclaims);
@@ -523,7 +524,6 @@ xfs_qm_shrink_scan(
         struct xfs_qm_isolate   isol;
         unsigned long           freed;
         int                     error;
-        unsigned long           nr_to_scan = sc->nr_to_scan;
 
         if ((sc->gfp_mask & (__GFP_FS|__GFP_WAIT)) != (__GFP_FS|__GFP_WAIT))
                 return 0;
@@ -531,8 +531,8 @@ xfs_qm_shrink_scan(
         INIT_LIST_HEAD(&isol.buffers);
         INIT_LIST_HEAD(&isol.dispose);
 
-        freed = list_lru_walk_node(&qi->qi_lru, sc->nid, xfs_qm_dquot_isolate, &isol,
-                                        &nr_to_scan);
+        freed = list_lru_shrink_walk(&qi->qi_lru, sc,
+                                     xfs_qm_dquot_isolate, &isol);
 
         error = xfs_buf_delwri_submit(&isol.buffers);
         if (error)
@@ -557,7 +557,7 @@ xfs_qm_shrink_count(
         struct xfs_quotainfo    *qi = container_of(shrink,
                                         struct xfs_quotainfo, qi_shrinker);
 
-        return list_lru_count_node(&qi->qi_lru, sc->nid);
+        return list_lru_shrink_count(&qi->qi_lru, sc);
 }
 
 /*
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index f2449fd86926..8fcc4ccc5c79 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1537,7 +1537,7 @@ xfs_fs_mount(
 static long
 xfs_fs_nr_cached_objects(
         struct super_block      *sb,
-        int                     nid)
+        struct shrink_control   *sc)
 {
         return xfs_reclaim_inodes_count(XFS_M(sb));
 }
@@ -1545,10 +1545,9 @@ xfs_fs_nr_cached_objects(
 static long
 xfs_fs_free_cached_objects(
         struct super_block      *sb,
-        long                    nr_to_scan,
-        int                     nid)
+        struct shrink_control   *sc)
 {
-        return xfs_reclaim_inodes_nr(XFS_M(sb), nr_to_scan);
+        return xfs_reclaim_inodes_nr(XFS_M(sb), sc->nr_to_scan);
 }
 
 static const struct super_operations xfs_super_operations = {