lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs: remove negative dentry when deleting subvolumne

Browse Source 
The use of btrfs_dentry_delete is removing dentries from the
dcache when deleting subvolumne. btrfs_dentry_delete ignores
negative dentries. This is incorrect since if we don't remove
the negative dentry, its parent dentry can't be removed.

Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Yan, Zheng
2009-10-09 09:25:16 -04:00
committed by Chris Mason
parent ff782e0a13
commit efefb1438b
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/btrfs/inode.c
View File

@@ -3629,12 +3629,14 @@ static int btrfs_dentry_delete(struct dentry *dentry)
{ {
struct btrfs_root *root; struct btrfs_root *root;
if (!dentry->d_inode) if (!dentry->d_inode && !IS_ROOT(dentry))
return 0; dentry = dentry->d_parent;
if (dentry->d_inode) {
root = BTRFS_I(dentry->d_inode)->root; root = BTRFS_I(dentry->d_inode)->root;
if (btrfs_root_refs(&root->root_item) == 0) if (btrfs_root_refs(&root->root_item) == 0)
return 1; return 1;
}
return 0; return 0;
} }

1
fs/btrfs/ioctl.c
View File

@@ -830,6 +830,7 @@ out_up_write:
out_unlock: out_unlock:
mutex_unlock(&inode->i_mutex); mutex_unlock(&inode->i_mutex);
if (!err) { if (!err) {
shrink_dcache_sb(root->fs_info->sb);
btrfs_invalidate_inodes(dest); btrfs_invalidate_inodes(dest);
d_delete(dentry); d_delete(dentry);
} }