From: Kees Cook
stable inclusion
from stable-5.10
category: feature
commit:47af61ffb19baa8df2b109582f87f7622fbe85cc
issue: #I4919J
--------------------------------
The name "allpstore" doesn't carry much meaning, so rename it to what it
actually is: the list of all records present in the filesystem. The lock
is also renamed accordingly.
Link: https://lore.kernel.org/lkml/20200506152114.50375-5-keescook@chromium.org/
Signed-off-by: Kees Cook
(cherry picked from commit 47af61ffb19baa8df2b109582f87f7622fbe85cc)
Signed-off-by: roger
---
fs/pstore/inode.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c
index d49fb7a8b664..73a57fec03fb 100644
--- a/fs/pstore/inode.c
+++ b/fs/pstore/inode.c
@@ -41,8 +41,8 @@
#define PSTORE_NAMELEN 64
-static DEFINE_SPINLOCK(allpstore_lock);
-static LIST_HEAD(allpstore);
+static DEFINE_SPINLOCK(records_list_lock);
+static LIST_HEAD(records_list);
struct pstore_private {
struct list_head list;
@@ -208,9 +208,9 @@ static void pstore_evict_inode(struct inode *inode)
clear_inode(inode);
if (p) {
- spin_lock_irqsave(&allpstore_lock, flags);
+ spin_lock_irqsave(&records_list_lock, flags);
list_del(&p->list);
- spin_unlock_irqrestore(&allpstore_lock, flags);
+ spin_unlock_irqrestore(&records_list_lock, flags);
free_pstore_private(p);
}
}
@@ -314,8 +314,8 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record)
WARN_ON(!inode_is_locked(d_inode(root)));
- spin_lock_irqsave(&allpstore_lock, flags);
- list_for_each_entry(pos, &allpstore, list) {
+ spin_lock_irqsave(&records_list_lock, flags);
+ list_for_each_entry(pos, &records_list, list) {
if (pos->record->type == record->type &&
pos->record->id == record->id &&
pos->record->psi == record->psi) {
@@ -323,7 +323,7 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record)
break;
}
}
- spin_unlock_irqrestore(&allpstore_lock, flags);
+ spin_unlock_irqrestore(&records_list_lock, flags);
if (rc)
return rc;
@@ -356,9 +356,9 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record)
d_add(dentry, inode);
- spin_lock_irqsave(&allpstore_lock, flags);
- list_add(&private->list, &allpstore);
- spin_unlock_irqrestore(&allpstore_lock, flags);
+ spin_lock_irqsave(&records_list_lock, flags);
+ list_add(&private->list, &records_list);
+ spin_unlock_irqrestore(&records_list_lock, flags);
return 0;
--
2.17.1
