pstore: Use dynamic spinlock initializer

The per-prz spinlock should be using the dynamic initializer so that
lockdep can correctly track it. Without this, under lockdep, we get a
warning at boot that the lock is in non-static memory.

Fixes: 109704492ef6 ("pstore: Make spinlock per zone instead of global")
Fixes: 76d5692a5803 ("pstore: Correctly initialize spinlock and flags")
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: stable@vger.kernel.org

diff --git a/fs/pstore/ram_core.c b/fs/pstore/ram_core.c
index bc927e30bdccd4fe89fd39d673126ae68d4e0e8e..e11672aa457514b8d84695688edc342f80a57b20 100644 (file)
--- a/fs/pstore/ram_core.c
+++ b/fs/pstore/ram_core.c
@@ -532,7 +532,7 @@ struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size,
        }
 
        /* Initialize general buffer state. */
-       prz->buffer_lock = __RAW_SPIN_LOCK_UNLOCKED(buffer_lock);
+       raw_spin_lock_init(&prz->buffer_lock);
        prz->flags = flags;
 
        ret = persistent_ram_buffer_map(start, size, prz, memtype);