The patch titled NFS: Fix an Oops in NFS unmount has been removed from the -mm tree. Its filename was nfs-fix-an-oops-in-nfs-unmount.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: NFS: Fix an Oops in NFS unmount From: Trond Myklebust <trond.myklebust@xxxxxxxxxx> Ensure that the dummy 'root dentry' is invisible to d_find_alias(). If not, then it may be spliced into the tree if a parent directory from the same filesystem gets mounted at a later time. Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/nfs/getroot.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff -puN fs/nfs/getroot.c~nfs-fix-an-oops-in-nfs-unmount fs/nfs/getroot.c --- a/fs/nfs/getroot.c~nfs-fix-an-oops-in-nfs-unmount +++ a/fs/nfs/getroot.c @@ -57,6 +57,17 @@ static int nfs_superblock_set_dummy_root } /* Circumvent igrab(): we know the inode is not being freed */ atomic_inc(&inode->i_count); + /* + * Ensure that this dentry is invisible to d_find_alias(). + * Otherwise, it may be spliced into the tree by + * d_materialise_unique if a parent directory from the same + * filesystem gets mounted at a later time. + * This again causes shrink_dcache_for_umount_subtree() to + * Oops, since the test for IS_ROOT() will fail. + */ + spin_lock(&dcache_lock); + list_del_init(&sb->s_root->d_alias); + spin_unlock(&dcache_lock); } return 0; } _ Patches currently in -mm which might be from trond.myklebust@xxxxxxxxxx are nfs-use-gfp_nofs-preloads-for-radix-tree-insertion.patch git-nfsd.patch pagecache-zeroing-zero_user_segment-zero_user_segments-and-zero_user.patch pagecache-zeroing-zero_user_segment-zero_user_segments-and-zero_user-fix.patch pagecache-zeroing-zero_user_segment-zero_user_segments-and-zero_user-fix-2.patch add-lock_page_killable.patch kernel-add-mutex_lock_killable.patch vfs-use-mutex_lock_killable-in-vfs_readdir.patch create-file_drop_write_access-helper.patch fix-up-new-filp-allocators.patch embed-a-struct-path-into-struct-nameidata-instead-of-nd-dentrymnt-nfs4-fix.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html