[Devel] [PATCH RHEL7 COMMIT] ms/xfs: convert dquot cache lru to list_lru fix

[Konstantin Khorenko]

The commit is pushed to "temp1" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-327.3.1.el7
------>
commit 346e97dc104b89ad01469346165499bcd64e99f8
Author: Vladimir Davydov <vdavydov at virtuozzo.com>
Date:   Fri Dec 25 13:48:41 2015 +0400

    ms/xfs: convert dquot cache lru to list_lru fix
    
    Patch series description:
    
    https://jira.sw.ru/browse/PSBM-42319
    
    Andrew Morton (1):
      xfs-convert-dquot-cache-lru-to-list_lru-fix
    
    Dave Chinner (2):
      xfs: convert dquot cache lru to list_lru
      xfs: fix dquot isolation hang
    
    Vladimir Davydov (3):
      xfs_qm: lost hunk from "ms/list_lru: dynamically adjust node arrays"
      xfs_qm: lost hunk from "ms/list_lru: introduce
        list_lru_shrink_{count,walk}"
      xfs_qm: lost hunk from "ms/list_lru: add helpers to isolate items"
    
    ================================
    This patch description:
    
    From: Andrew Morton <akpm at linux-foundation.org>
    
    fix warnings
    
    Cc: Dave Chinner <dchinner at redhat.com>
    Cc: Glauber Costa <glommer at openvz.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
    (cherry picked from commit 2f5b56f85674d75f35a10e2e9a4310e7539280da)
    Signed-off-by: Vladimir Davydov <vdavydov at virtuozzo.com>
---
 fs/xfs/xfs_qm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index e831704..edf2349 100644
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -510,7 +510,7 @@ out_unlock_dirty:
 	return 3;
 }
 
-static long
+static unsigned long
 xfs_qm_shrink_scan(
 	struct shrinker		*shrink,
 	struct shrink_control	*sc)
@@ -518,7 +518,7 @@ xfs_qm_shrink_scan(
 	struct xfs_quotainfo	*qi = container_of(shrink,
 					struct xfs_quotainfo, qi_shrinker);
 	struct xfs_qm_isolate	isol;
-	long			freed;
+	unsigned long		freed;
 	int			error;
 	unsigned long		nr_to_scan = sc->nr_to_scan;
 
@@ -546,7 +546,7 @@ xfs_qm_shrink_scan(
 	return freed;
 }
 
-static long
+static unsigned long
 xfs_qm_shrink_count(
 	struct shrinker		*shrink,
 	struct shrink_control	*sc)