android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't mess with generic_permission() under ->d_lock in hpfs

Browse Source 
Just use dentry_unhash() there

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2010-02-01 11:05:16 -05:00
parent 391e8bbd38
commit e21e7095a7
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/hpfs/namei.c
View File

@ -413,22 +413,25 @@ static int hpfs_unlink(struct inode *dir, struct dentry *dentry)
mutex_unlock(&hpfs_i(dir)->i_mutex); mutex_unlock(&hpfs_i(dir)->i_mutex);
mutex_unlock(&hpfs_i(inode)->i_parent_mutex); mutex_unlock(&hpfs_i(inode)->i_parent_mutex);
d_drop(dentry); dentry_unhash(dentry);
spin_lock(&dentry->d_lock); if (!d_unhashed(dentry)) {
if (atomic_read(&dentry->d_count) > 1 || dput(dentry);
generic_permission(inode, MAY_WRITE, NULL) || unlock_kernel();
return -ENOSPC;
}
if (generic_permission(inode, MAY_WRITE, NULL) ||
!S_ISREG(inode->i_mode) || !S_ISREG(inode->i_mode) ||
get_write_access(inode)) { get_write_access(inode)) {
spin_unlock(&dentry->d_lock);
d_rehash(dentry); d_rehash(dentry);
dput(dentry);
} else { } else {
struct iattr newattrs; struct iattr newattrs;
spin_unlock(&dentry->d_lock);
/*printk("HPFS: truncating file before delete.\n");*/ /*printk("HPFS: truncating file before delete.\n");*/
newattrs.ia_size = 0; newattrs.ia_size = 0;
newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME; newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
err = notify_change(dentry, &newattrs); err = notify_change(dentry, &newattrs);
put_write_access(inode); put_write_access(inode);
dput(dentry);
if (!err) if (!err)
goto again; goto again;
} }