nfs: use IS_ROOT not DCACHE_DISCONNECTED
Subsystems (2)
PATCH 1/1 nfs: use IS_ROOT not DCACHE_DISCONNECTED
From: "J. Bruce Fields" <[email protected]>
This check was added by Al Viro with d9e80b7de91db05c1c4d2e5ebbfd70b3b3ba0e0f "nfs d_revalidate() is too trigger-happy with d_drop()", with the explanation that we don't want to remove the root of a disconnected tree, which will still be included on the s_anon list.
But DCACHE_DISCONNECTED does *not* actually identify dentries that are disconnected from the dentry tree or hashed on s_anon. IS_ROOT() is the way to do that.
Also add a comment from Al's commit to remind us why this check is there.
--- fs/nfs/dir.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
fs/nfs/dir.c +7 -1
@@ -1139,7 +1139,13 @@ out_zap_parent:if (inode &&S_ISDIR (inode->i_mode)) {/* Purge readdir caches. */ nfs_zap_caches (inode); -if (dentry->d_flags &DCACHE_DISCONNECTED ) +/* +* We can't d_drop the root of a disconnected tree: +* its d_hash is on the s_anon list and d_drop() would hide +* it from shrink_dcache_for_unmount(), leading to busy +* inodes on unmount and further oopses. +*/ +if (IS_ROOT (dentry)) goto out_valid; }/* If we have submounts, don't unhash ! */
Signature · 1 line
1.7.9.5
Quoted 8 lines · J. Bruce Fields
From: "J. Bruce Fields" <[email protected]>
This check was added by Al Viro with
d9e80b7de91db05c1c4d2e5ebbfd70b3b3ba0e0f"nfsd_revalidate()is too trigger-happy withd_drop()", with the explanation that we don't want to remove the root of a disconnected tree, which will still be included on thes_anonlist.
Quoted 6 lines
But
DCACHE_DISCONNECTEDdoes *not* actually identify dentries that are disconnected from the dentry tree or hashed ons_anon.IS_ROOT()is the way to do that.Also add a comment from Al's commit to remind us why this check is there.
Looks good.