From: tip-bot for Borislav Petkov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: mingo@kernel.org, linux-kernel@vger.kernel.org,
torvalds@linux-foundation.org, bp@suse.de, hpa@zytor.com,
tglx@linutronix.de, peterz@infradead.org
Subject: [tip:ras/core] x86/RAS/mce_amd_inj: Remove debugfs dir recursively on exit
Date: Mon, 26 Sep 2016 09:32:03 -0700 [thread overview]
Message-ID: <tip-b199ac6c4943aa0db246163bf6b483e2bb53431b@git.kernel.org> (raw)
In-Reply-To: <20160926083152.30848-3-bp@alien8.de>
Commit-ID: b199ac6c4943aa0db246163bf6b483e2bb53431b
Gitweb: http://git.kernel.org/tip/b199ac6c4943aa0db246163bf6b483e2bb53431b
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Mon, 26 Sep 2016 10:31:52 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 26 Sep 2016 11:13:17 +0200
x86/RAS/mce_amd_inj: Remove debugfs dir recursively on exit
Simplify exit_mce_inject() by using debugfs_remove_recursive() and do
away with the noodling over the dentry elements.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20160926083152.30848-3-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/ras/mce_amd_inj.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/x86/ras/mce_amd_inj.c b/arch/x86/ras/mce_amd_inj.c
index 20b227f..1ac7647 100644
--- a/arch/x86/ras/mce_amd_inj.c
+++ b/arch/x86/ras/mce_amd_inj.c
@@ -475,15 +475,11 @@ err_dfs_add:
static void __exit exit_mce_inject(void)
{
- int i;
- for (i = 0; i < ARRAY_SIZE(dfs_fls); i++)
- debugfs_remove(dfs_fls[i].d);
+ debugfs_remove_recursive(dfs_inj);
+ dfs_inj = NULL;
memset(&dfs_fls, 0, sizeof(dfs_fls));
-
- debugfs_remove(dfs_inj);
- dfs_inj = NULL;
}
module_init(init_mce_inject);
module_exit(exit_mce_inject);
prev parent reply other threads:[~2016-09-26 16:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-26 8:31 [PATCH 0/2] x86/ras: Two more for 4.9 Borislav Petkov
2016-09-26 8:31 ` [PATCH 1/2] x86/RAS/mce_amd_inj: Fix signed wrap around when decrementing index i Borislav Petkov
2016-09-26 16:31 ` [tip:ras/core] x86/RAS/mce_amd_inj: Fix signed wrap around when decrementing index 'i' tip-bot for Colin Ian King
2016-09-26 8:31 ` [PATCH 2/2] x86/RAS/mce_amd_inj: Remove debugfs dir recursively on exit Borislav Petkov
2016-09-26 16:32 ` tip-bot for Borislav Petkov [this message]
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=tip-b199ac6c4943aa0db246163bf6b483e2bb53431b@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/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