pstore: switch to locked_recursive_removal()

Al Viro · Al Viro · commit 7b7a8ca43fcf · 2025-07-02T22:36:51.000-04:00
rather than playing with manual d_invalidate()

Reviewed-by: Christian Brauner &lt;brauner@kernel.org&gt;
Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c
@@ -300,7 +300,7 @@ static struct dentry *psinfo_lock_root(void)
 		return NULL;
 
 	root = pstore_sb->s_root;
-	inode_lock(d_inode(root));
+	inode_lock_nested(d_inode(root), I_MUTEX_PARENT);
 
 	return root;
 }
@@ -318,8 +318,7 @@ int pstore_put_backend_records(struct pstore_info *psi)
 		list_for_each_entry_safe(pos, tmp, &records_list, list) {
 			if (pos->record->psi == psi) {
 				list_del_init(&pos->list);
-				d_invalidate(pos->dentry);
-				simple_unlink(d_inode(root), pos->dentry);
+				locked_recursive_removal(pos->dentry, NULL);
 				pos->dentry = NULL;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ static struct dentry *psinfo_lock_root(void)`
`300`	`300`	`return NULL;`
`301`	`301`
`302`	`302`	`root = pstore_sb->s_root;`
`303`		`- inode_lock(d_inode(root));`
	`303`	`+ inode_lock_nested(d_inode(root), I_MUTEX_PARENT);`
`304`	`304`
`305`	`305`	`return root;`
`306`	`306`	`}`
`@@ -318,8 +318,7 @@ int pstore_put_backend_records(struct pstore_info *psi)`
`318`	`318`	`list_for_each_entry_safe(pos, tmp, &records_list, list) {`
`319`	`319`	`if (pos->record->psi == psi) {`
`320`	`320`	`list_del_init(&pos->list);`
`321`		`- d_invalidate(pos->dentry);`
`322`		`- simple_unlink(d_inode(root), pos->dentry);`
	`321`	`+ locked_recursive_removal(pos->dentry, NULL);`
`323`	`322`	`pos->dentry = NULL;`
`324`	`323`	`}`
`325`	`324`	`}`