From c30b20cd96a7a08e77c12cb3326c6fd801f7fe87 Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Tue, 5 May 2020 23:29:10 -0700 Subject: pstore: Rename "pstore_lock" to "psinfo_lock" The name "pstore_lock" sounds very global, but it is only supposed to be used for managing changes to "psinfo", so rename it accordingly. Link: https://lore.kernel.org/lkml/20200506152114.50375-3-keescook@chromium.org/ Signed-off-by: Kees Cook --- fs/pstore/platform.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'fs/pstore') diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index 44f8b9742263..347b6c07f4cf 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@ -69,10 +69,10 @@ static void pstore_dowork(struct work_struct *); static DECLARE_WORK(pstore_work, pstore_dowork); /* - * pstore_lock just protects "psinfo" during + * psinfo_lock just protects "psinfo" during * calls to pstore_register() */ -static DEFINE_SPINLOCK(pstore_lock); +static DEFINE_SPINLOCK(psinfo_lock); struct pstore_info *psinfo; static char *backend; @@ -574,11 +574,11 @@ int pstore_register(struct pstore_info *psi) return -EINVAL; } - spin_lock(&pstore_lock); + spin_lock(&psinfo_lock); if (psinfo) { pr_warn("backend '%s' already loaded: ignoring '%s'\n", psinfo->name, psi->name); - spin_unlock(&pstore_lock); + spin_unlock(&psinfo_lock); return -EBUSY; } @@ -587,7 +587,7 @@ int pstore_register(struct pstore_info *psi) psinfo = psi; mutex_init(&psinfo->read_mutex); sema_init(&psinfo->buf_lock, 1); - spin_unlock(&pstore_lock); + spin_unlock(&psinfo_lock); if (psi->flags & PSTORE_FLAGS_DMESG) -- cgit v1.2.3