From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752455AbcD1Pjm (ORCPT ); Thu, 28 Apr 2016 11:39:42 -0400 Received: from mail-qg0-f66.google.com ([209.85.192.66]:33707 "EHLO mail-qg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752189AbcD1Pjk (ORCPT ); Thu, 28 Apr 2016 11:39:40 -0400 From: Dan Streetman To: Minchan Kim , Nitin Gupta , Andrew Morton Cc: Sergey Senozhatsky , Seth Jennings , Yu Zhao , Linux-MM , Sergey Senozhatsky , linux-kernel , Dan Streetman , Dan Streetman Subject: [PATCH] mm/zsmalloc: don't fail if can't create debugfs info Date: Thu, 28 Apr 2016 11:36:48 -0400 Message-Id: <1461857808-11030-1-git-send-email-ddstreet@ieee.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Change the return type of zs_pool_stat_create() to void, and remove the logic to abort pool creation if the stat debugfs dir/file could not be created. The debugfs stat file is for debugging/information only, and doesn't affect operation of zsmalloc; there is no reason to abort creating the pool if the stat file can't be created. This was seen with zswap, which used the same name for all pool creations, which caused zsmalloc to fail to create a second pool for zswap if CONFIG_ZSMALLOC_STAT was enabled. Cc: Dan Streetman Signed-off-by: Dan Streetman --- mm/zsmalloc.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index e72efb1..25a7db2 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -567,17 +567,17 @@ static const struct file_operations zs_stat_size_ops = { .release = single_release, }; -static int zs_pool_stat_create(const char *name, struct zs_pool *pool) +static void zs_pool_stat_create(const char *name, struct zs_pool *pool) { struct dentry *entry; if (!zs_stat_root) - return -ENODEV; + return; entry = debugfs_create_dir(name, zs_stat_root); if (!entry) { pr_warn("debugfs dir <%s> creation failed\n", name); - return -ENOMEM; + return; } pool->stat_dentry = entry; @@ -586,10 +586,8 @@ static int zs_pool_stat_create(const char *name, struct zs_pool *pool) if (!entry) { pr_warn("%s: debugfs file entry <%s> creation failed\n", name, "classes"); - return -ENOMEM; + return; } - - return 0; } static void zs_pool_stat_destroy(struct zs_pool *pool) @@ -607,9 +605,8 @@ static void __exit zs_stat_exit(void) { } -static inline int zs_pool_stat_create(const char *name, struct zs_pool *pool) +static inline void zs_pool_stat_create(const char *name, struct zs_pool *pool) { - return 0; } static inline void zs_pool_stat_destroy(struct zs_pool *pool) @@ -1956,8 +1953,8 @@ struct zs_pool *zs_create_pool(const char *name, gfp_t flags) pool->flags = flags; - if (zs_pool_stat_create(name, pool)) - goto err; + /* debug only, don't abort if it fails */ + zs_pool_stat_create(name, pool); /* * Not critical, we still can use the pool -- 2.7.4