Commit c30b20cd authored by Kees Cook's avatar Kees Cook

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: default avatarKees Cook <keescook@chromium.org>
parent e7c1c00c
...@@ -69,10 +69,10 @@ static void pstore_dowork(struct work_struct *); ...@@ -69,10 +69,10 @@ static void pstore_dowork(struct work_struct *);
static DECLARE_WORK(pstore_work, pstore_dowork); static DECLARE_WORK(pstore_work, pstore_dowork);
/* /*
* pstore_lock just protects "psinfo" during * psinfo_lock just protects "psinfo" during
* calls to pstore_register() * calls to pstore_register()
*/ */
static DEFINE_SPINLOCK(pstore_lock); static DEFINE_SPINLOCK(psinfo_lock);
struct pstore_info *psinfo; struct pstore_info *psinfo;
static char *backend; static char *backend;
...@@ -574,11 +574,11 @@ int pstore_register(struct pstore_info *psi) ...@@ -574,11 +574,11 @@ int pstore_register(struct pstore_info *psi)
return -EINVAL; return -EINVAL;
} }
spin_lock(&pstore_lock); spin_lock(&psinfo_lock);
if (psinfo) { if (psinfo) {
pr_warn("backend '%s' already loaded: ignoring '%s'\n", pr_warn("backend '%s' already loaded: ignoring '%s'\n",
psinfo->name, psi->name); psinfo->name, psi->name);
spin_unlock(&pstore_lock); spin_unlock(&psinfo_lock);
return -EBUSY; return -EBUSY;
} }
...@@ -587,7 +587,7 @@ int pstore_register(struct pstore_info *psi) ...@@ -587,7 +587,7 @@ int pstore_register(struct pstore_info *psi)
psinfo = psi; psinfo = psi;
mutex_init(&psinfo->read_mutex); mutex_init(&psinfo->read_mutex);
sema_init(&psinfo->buf_lock, 1); sema_init(&psinfo->buf_lock, 1);
spin_unlock(&pstore_lock); spin_unlock(&psinfo_lock);
if (psi->flags & PSTORE_FLAGS_DMESG) if (psi->flags & PSTORE_FLAGS_DMESG)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment