From: Michal Hocko <mhocko@kernel.org>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: Dave Chinner <david@fromorbit.com>,
Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>,
linux-xfs@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
Michal Hocko <mhocko@suse.com>
Subject: [PATCH] xfs: handle register_shrinker error
Date: Thu, 23 Nov 2017 13:08:28 +0100 [thread overview]
Message-ID: <20171123120828.31881-1-mhocko@kernel.org> (raw)
From: Michal Hocko <mhocko@suse.com>
xfs_alloc_buftarg doesn't handle register_shrinker error path. While it
is unlikely to trigger it is not impossible especially with large NUMAs.
Let's handle the failure to make the code more robust.
Signed-off-by: Michal Hocko <mhocko@suse.com>
---
Hi,
this is not tested but it looks quite straightforward. There is one more
unchecked register_shrinker in xfs_qm_init_quotainfo but my absolute
lack of familiarity with the code didn't allow me to come up with a
mechanical fix like this one.
fs/xfs/xfs_buf.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 4db6e8d780f6..dd0e18af990c 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -1827,7 +1827,10 @@ xfs_alloc_buftarg(
btp->bt_shrinker.scan_objects = xfs_buftarg_shrink_scan;
btp->bt_shrinker.seeks = DEFAULT_SEEKS;
btp->bt_shrinker.flags = SHRINKER_NUMA_AWARE;
- register_shrinker(&btp->bt_shrinker);
+ if (register_shrinker(&btp->bt_shrinker)) {
+ percpu_counter_destroy(&btp->bt_io_count);
+ goto error;
+ }
return btp;
error:
--
2.15.0
next reply other threads:[~2017-11-23 12:08 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-23 12:08 Michal Hocko [this message]
2017-11-23 13:26 ` [PATCH] xfs: handle register_shrinker error Christoph Hellwig
2017-11-23 13:41 ` Michal Hocko
2017-11-23 16:01 ` Tetsuo Handa
2017-11-23 16:11 ` Michal Hocko
2017-11-23 16:17 ` Tetsuo Handa
2017-11-23 16:31 ` Michal Hocko
2017-11-23 22:00 ` Dave Chinner
2017-11-24 7:39 ` [PATCH v2] " Michal Hocko
2017-11-24 12:03 ` Tetsuo Handa
2017-11-24 12:09 ` Michal Hocko
2017-11-25 23:34 ` Dave Chinner
2017-11-26 2:14 ` Tetsuo Handa
2017-11-27 8:05 ` Michal Hocko
2017-11-27 17:44 ` Darrick J. Wong
2017-11-28 9:35 ` Michal Hocko
2017-11-28 16:39 ` Darrick J. Wong
2017-11-28 19:40 ` Michal Hocko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171123120828.31881-1-mhocko@kernel.org \
--to=mhocko@kernel.org \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=mhocko@suse.com \
--cc=penguin-kernel@I-love.SAKURA.ne.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).