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 493b5037d5e8ff1c4fb5d8cb19745050b5d4d28c
Author: Vladimir Davydov <vdavy...@virtuozzo.com>
Date: Fri Dec 25 13:48:42 2015 +0400
ms/xfs_qm: lost hunk from "ms/list_lru: introduce
list_lru_shrink_{count,walk}"
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:
Signed-off-by: Vladimir Davydov <vdavy...@virtuozzo.com>
---
fs/xfs/xfs_qm.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index 51be564..3ecd3ee 100644
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -522,7 +522,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;
@@ -530,8 +529,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)
@@ -556,7 +555,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);
}
/*
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
