From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) by kanga.kvack.org (Postfix) with ESMTP id BD77A6B006E for ; Wed, 28 Jan 2015 11:23:04 -0500 (EST) Received: by mail-pa0-f43.google.com with SMTP id eu11so27053288pac.2 for ; Wed, 28 Jan 2015 08:23:04 -0800 (PST) Received: from mx2.parallels.com (mx2.parallels.com. [199.115.105.18]) by mx.google.com with ESMTPS id rb8si6269343pbc.185.2015.01.28.08.23.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jan 2015 08:23:04 -0800 (PST) From: Vladimir Davydov Subject: [PATCH -mm v2 2/3] slub: fix kmem_cache_shrink return value Date: Wed, 28 Jan 2015 19:22:50 +0300 Message-ID: <7ee54d0d26f6c61e2ecf50300ee955610749b344.1422461573.git.vdavydov@parallels.com> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton Cc: Christoph Lameter , Joonsoo Kim , Pekka Enberg , David Rientjes , Johannes Weiner , Michal Hocko , linux-mm@kvack.org, linux-kernel@vger.kernel.org It is supposed to return 0 if the cache has no remaining objects and 1 otherwise, while currently it always returns 0. Fix it. Signed-off-by: Vladimir Davydov --- mm/slub.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mm/slub.c b/mm/slub.c index dbf9334b6a5c..63abe52c2951 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3379,6 +3379,7 @@ int __kmem_cache_shrink(struct kmem_cache *s) LIST_HEAD(discard); struct list_head promote[SHRINK_PROMOTE_MAX]; unsigned long flags; + int ret = 0; for (i = 0; i < SHRINK_PROMOTE_MAX; i++) INIT_LIST_HEAD(promote + i); @@ -3419,6 +3420,9 @@ int __kmem_cache_shrink(struct kmem_cache *s) for (i = SHRINK_PROMOTE_MAX - 1; i >= 0; i--) list_splice_init(promote + i, &n->partial); + if (n->nr_partial || slabs_node(s, node)) + ret = 1; + spin_unlock_irqrestore(&n->list_lock, flags); /* Release empty slabs */ @@ -3426,7 +3430,7 @@ int __kmem_cache_shrink(struct kmem_cache *s) discard_slab(s, page); } - return 0; + return ret; } static int slab_mem_going_offline_callback(void *arg) -- 1.7.10.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org