From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752441AbcISP7O (ORCPT ); Mon, 19 Sep 2016 11:59:14 -0400 Received: from mail.kernel.org ([198.145.29.136]:47684 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751327AbcISP7M (ORCPT ); Mon, 19 Sep 2016 11:59:12 -0400 From: Chao Yu To: swhiteho@redhat.com, rpeterso@redhat.com Cc: cluster-devel@redhat.com, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH] gfs2: fix to detect failure of register_shrinker Date: Mon, 19 Sep 2016 23:46:01 +0800 Message-Id: <1474299961-17951-1-git-send-email-chao@kernel.org> X-Mailer: git-send-email 2.7.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chao Yu register_shrinker can fail after commit 1d3d4437eae1 ("vmscan: per-node deferred work"), we should detect the failure of it, otherwise we may fail to register shrinker after gfs2 module was been inited successfully. Signed-off-by: Chao Yu --- fs/gfs2/glock.c | 8 +++++++- fs/gfs2/main.c | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index c8e2e7f..14cbf60 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c @@ -1781,7 +1781,13 @@ int __init gfs2_glock_init(void) return -ENOMEM; } - register_shrinker(&glock_shrinker); + ret = register_shrinker(&glock_shrinker); + if (ret) { + destroy_workqueue(gfs2_delete_workqueue); + destroy_workqueue(glock_workqueue); + rhashtable_destroy(&gl_hash_table); + return ret; + } return 0; } diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c index 74fd013..67d1fc4 100644 --- a/fs/gfs2/main.c +++ b/fs/gfs2/main.c @@ -145,7 +145,9 @@ static int __init init_gfs2_fs(void) if (!gfs2_qadata_cachep) goto fail; - register_shrinker(&gfs2_qd_shrinker); + error = register_shrinker(&gfs2_qd_shrinker); + if (error) + goto fail; error = register_filesystem(&gfs2_fs_type); if (error) -- 2.7.2