projects
/
unionfs-2.6.39.y.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c323b17
)
patch unionfs-remove-unnecessary-lockdep-off-on-in-rmdir.patch
author
Erez Zadok
<ezk@cs.sunysb.edu>
Fri, 4 Dec 2009 02:23:24 +0000
(21:23 -0500)
committer
Erez Zadok
<ezk@cs.sunysb.edu>
Fri, 12 Aug 2011 02:39:16 +0000
(22:39 -0400)
fs/unionfs/unlink.c
patch
|
blob
|
history
diff --git
a/fs/unionfs/unlink.c
b/fs/unionfs/unlink.c
index b6d8e10d205380c1ac7a90a69701310cf2817001..273077376a126e3af084cff8eebadd1ec43774b6 100644
(file)
--- 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);