From: Erez Zadok Date: Fri, 4 Dec 2009 02:23:24 +0000 (-0500) Subject: patch unionfs-remove-unnecessary-lockdep-off-on-in-rmdir.patch X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=25f255fd06f29a68ad8a1bfb6d58c14add2acb02;p=unionfs-3.13.y.git patch unionfs-remove-unnecessary-lockdep-off-on-in-rmdir.patch --- diff --git a/fs/unionfs/unlink.c b/fs/unionfs/unlink.c index b6d8e10d205..273077376a1 100644 --- a/fs/unionfs/unlink.c +++ b/fs/unionfs/unlink.c @@ -184,12 +184,8 @@ static int unionfs_rmdir_first(struct inode *dir, struct dentry *dentry, /* avoid destroying the lower inode if the file is in use */ dget(lower_dentry); err = is_robranch(dentry); - if (!err) { - /* see Documentation/filesystems/unionfs/issues.txt */ - lockdep_off(); + if (!err) err = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry); - lockdep_on(); - } dput(lower_dentry); fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);