From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Sep 2013 22:01:38 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: accepted/tizen/common/20141203.182822~1462
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=26935fb06ee88f1188789807687c03041f3c70d9;p=platform%2Fkernel%2Flinux-arm64.git

Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs

Pull vfs pile 4 from Al Viro:
 "list_lru pile, mostly"

This came out of Andrew's pile, Al ended up doing the merge work so that
Andrew didn't have to.

Additionally, a few fixes.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (42 commits)
  super: fix for destroy lrus
  list_lru: dynamically adjust node arrays
  shrinker: Kill old ->shrink API.
  shrinker: convert remaining shrinkers to count/scan API
  staging/lustre/libcfs: cleanup linux-mem.h
  staging/lustre/ptlrpc: convert to new shrinker API
  staging/lustre/obdclass: convert lu_object shrinker to count/scan API
  staging/lustre/ldlm: convert to shrinkers to count/scan API
  hugepage: convert huge zero page shrinker to new shrinker API
  i915: bail out earlier when shrinker cannot acquire mutex
  drivers: convert shrinkers to new count/scan API
  fs: convert fs shrinkers to new scan/count API
  xfs: fix dquot isolation hang
  xfs-convert-dquot-cache-lru-to-list_lru-fix
  xfs: convert dquot cache lru to list_lru
  xfs: rework buffer dispose list tracking
  xfs-convert-buftarg-lru-to-generic-code-fix
  xfs: convert buftarg LRU to generic code
  fs: convert inode and dentry shrinking to be node aware
  vmscan: per-node deferred work
  ...
---

26935fb06ee88f1188789807687c03041f3c70d9
diff --cc mm/vmscan.c
index fe715da,e364542..beb3577
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@@ -2829,9 -2854,11 +2867,11 @@@ static bool kswapd_shrink_zone(struct z
  		return true;
  
  	shrink_zone(zone, sc);
+ 	nodes_clear(shrink.nodes_to_scan);
+ 	node_set(zone_to_nid(zone), shrink.nodes_to_scan);
  
  	reclaim_state->reclaimed_slab = 0;
 -	nr_slab = shrink_slab(&shrink, sc->nr_scanned, lru_pages);
 +	shrink_slab(&shrink, sc->nr_scanned, lru_pages);
  	sc->nr_reclaimed += reclaim_state->reclaimed_slab;
  
  	/* Account for the number of pages attempted to reclaim */