ocfs2: prune the dcache before deleting the dentry of directory
PATCH 1/4 ocfs2: prune the dcache before deleting the dentry of directory
From: alex chen <[email protected]>
Subject: ocfs2: prune the dcache before deleting the dentry of directory
In ocfs2_dentry_convert_worker, we should prune the dcache before deleting the dentry of directory, otherwise, in the following cases the inode of directory will still remain in orphan directory until the device being umounted.
Mount point: /mnt/ocfs2
Node A Node B
mkdir /mnt/ocfs2/testdir
ocfs2_mkdir
->ocfs2_mknod
->ocfs2_dentry_attach_lock
->ocfs2_dentry_lock(dentry, 0)
... ...
touch /mnt/ocfs2/testdir/testfile
unlink /mnt/test/testdir/testfile
rmdir /mnt/ocfs2/testdir
ocfs2_unlink
->ocfs2_remote_dentry_delete
->ocfs2_dentry_lock(dentry, 1)
... ...... ...ocfs2_downconvert_thread
->ocfs2_unblock_lock
->ocfs2_dentry_convert_worker
->ocfs2_find_local_alias
->dget_dlock
->d_delete
Here the dentry can not be
released because the children's
dentry is negative but still exist.
Finally, this inode will still remain
in orphan directory until its children
are destroyed.
So before deleting dentry of directory, we should prune the dcache to remove unused children of the parent dentry by shrink_dcache_parent().
---
fs/ocfs2/dlmglue.c | 3 +++ 1 file changed, 3 insertions(+)
fs/ocfs2/dlmglue.c renamed from fs/ocfs2/dlmglue.c~ocfs2-prune-the-dcache-before-deleting-the-dentry-of-directory +3 -0
@@ -3750,6 +3750,9 @@ static int ocfs2_dentry_convert_worker(sbreak ;spin_unlock (&dentry_attach_lock); +if (S_ISDIR (dl->dl_inode->i_mode)) +shrink_dcache_parent (dentry); +mlog (0 ,"d_delete(%pd);\n" , dentry);/*
_
PATCH 1/4 ocfs2: prune the dcache before deleting the dentry of directory
Quoted 7 lines · Andrew Morton
From: alex chen <[email protected]>
Subject: ocfs2: prune the dcache before deleting the dentry of directoryIn
ocfs2_dentry_convert_worker, we should prune the dcache before deleting the dentry of directory, otherwise, in the following cases the inode of directory will still remain in orphan directory until the device being umounted.
...
Quoted 3 lines
Signed-off-by Alex Chen <[email protected]>Reviewed-by Joseph Qi <[email protected]>Reviewed-by joyce.xue <[email protected]>
Looks good, thanks Alex!