xfs
[Top] [All Lists]

[PATCH] xfs: Register hotcpu notifier after initialization

To: xfs@xxxxxxxxxxx
Subject: [PATCH] xfs: Register hotcpu notifier after initialization
From: Richard Weinberger <richard@xxxxxx>
Date: Mon, 19 Aug 2013 22:56:44 +0200
Cc: bpm@xxxxxxx, elder@xxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, Richard Weinberger <richard@xxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
Currently the code initializizes mp->m_icsb_mutex and other things
_after_ register_hotcpu_notifier().
As the notifier takes mp->m_icsb_mutex it can happen
that it takes the lock before it's initialization.

Signed-off-by: Richard Weinberger <richard@xxxxxx>
---
 fs/xfs/xfs_mount.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 2b0ba35..986f9cf 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -2260,12 +2260,6 @@ xfs_icsb_init_counters(
        if (mp->m_sb_cnts == NULL)
                return -ENOMEM;
 
-#ifdef CONFIG_HOTPLUG_CPU
-       mp->m_icsb_notifier.notifier_call = xfs_icsb_cpu_notify;
-       mp->m_icsb_notifier.priority = 0;
-       register_hotcpu_notifier(&mp->m_icsb_notifier);
-#endif /* CONFIG_HOTPLUG_CPU */
-
        for_each_online_cpu(i) {
                cntp = (xfs_icsb_cnts_t *)per_cpu_ptr(mp->m_sb_cnts, i);
                memset(cntp, 0, sizeof(xfs_icsb_cnts_t));
@@ -2278,6 +2272,13 @@ xfs_icsb_init_counters(
         * initial balance kicks us off correctly
         */
        mp->m_icsb_counters = -1;
+
+#ifdef CONFIG_HOTPLUG_CPU
+       mp->m_icsb_notifier.notifier_call = xfs_icsb_cpu_notify;
+       mp->m_icsb_notifier.priority = 0;
+       register_hotcpu_notifier(&mp->m_icsb_notifier);
+#endif /* CONFIG_HOTPLUG_CPU */
+
        return 0;
 }
 
-- 
1.8.3.1

<Prev in Thread] Current Thread [Next in Thread>