github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 09:36:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

kill configfs_drop_dentry()

Browse Source 
Fold into the only remaining user, don't bother with the timestamps
of parent - we are going to rmdir it shortly anyway, which will
override those.

Fix the locking of inode, while we are at it - updating the link
count and timestamps ought to be done with the inode locked.

Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2026-05-12 12:53:35 -04:00
parent 1387aedb39
commit 43b45755e8
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/configfs/configfs_internal.h
View File

@ -76,7 +76,6 @@ extern int configfs_make_dirent(struct configfs_dirent *, struct dentry *,
extern int configfs_dirent_is_ready(struct configfs_dirent *);
extern const unsigned char * configfs_get_name(struct configfs_dirent *sd);
extern void configfs_drop_dentry(struct configfs_dirent *sd, struct dentry *parent);
extern int configfs_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *iattr);

24
fs/configfs/dir.c
View File

@ -581,12 +581,34 @@ static void detach_attrs(struct dentry *dentry)
spin_lock(&configfs_dirent_lock);
for (sd = next_dirent(parent_sd, NULL); sd; sd = next) {
struct dentry *child;
next = next_dirent(parent_sd, sd);
if (!(sd->s_type & CONFIGFS_NOT_PINNED))
continue;
list_del_init(&sd->s_sibling);
child = sd->s_dentry;
if (child) {
spin_lock(&child->d_lock);
if (simple_positive(child)) {
dget_dlock(child);
__d_drop(child);
spin_unlock(&child->d_lock);
} else {
spin_unlock(&child->d_lock);
child = NULL;
}
}
spin_unlock(&configfs_dirent_lock);
configfs_drop_dentry(sd, dentry);
if (child) {
struct inode *inode = child->d_inode;
inode_lock_nested(inode, I_MUTEX_NONDIR2);
inode_set_ctime_current(inode);
drop_nlink(inode);
inode_unlock(inode);
dput(child);
}
configfs_put(sd);
spin_lock(&configfs_dirent_lock);
}

22
fs/configfs/inode.c
View File

@ -195,25 +195,3 @@ const unsigned char * configfs_get_name(struct configfs_dirent *sd)
}
return NULL;
}
/*
* Unhashes the dentry corresponding to given configfs_dirent
* Called with parent inode's i_mutex held.
*/
void configfs_drop_dentry(struct configfs_dirent * sd, struct dentry * parent)
{
struct dentry * dentry = sd->s_dentry;
if (dentry) {
spin_lock(&dentry->d_lock);
if (simple_positive(dentry)) {
dget_dlock(dentry);
__d_drop(dentry);
spin_unlock(&dentry->d_lock);
__simple_unlink(d_inode(parent), dentry);
dput(dentry);
} else
spin_unlock(&dentry->d_lock);
}
}