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 a9d4427c300bf07f95e723eb5fde8e3c84f03f88 Author: Vladimir Davydov <vdavy...@virtuozzo.com> Date: Fri Dec 25 13:48:43 2015 +0400
ms/xfs_qm: lost hunk from "ms/list_lru: add helpers to isolate items" 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index 3ecd3ee..420a093 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) { @@ -449,7 +450,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; } @@ -493,7 +494,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); _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel