Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 24896
b: refs/heads/master
c: 7a2bd3f
h: refs/heads/master
v: v3
  • Loading branch information
Amy Griffis authored and Linus Torvalds committed Mar 31, 2006
1 parent aed9b2c commit ac1257a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 094e320d761dae5816d8faa695b0509eea79c108
refs/heads/master: 7a2bd3f7efa86e8b56482a8f8948c8b222064a67
6 changes: 3 additions & 3 deletions trunk/fs/dcache.c
Original file line number Diff line number Diff line change
Expand Up @@ -1172,11 +1172,11 @@ void d_delete(struct dentry * dentry)
spin_lock(&dentry->d_lock);
isdir = S_ISDIR(dentry->d_inode->i_mode);
if (atomic_read(&dentry->d_count) == 1) {
/* remove this and other inotify debug checks after 2.6.18 */
dentry->d_flags &= ~DCACHE_INOTIFY_PARENT_WATCHED;

dentry_iput(dentry);
fsnotify_nameremove(dentry, isdir);

/* remove this and other inotify debug checks after 2.6.18 */
dentry->d_flags &= ~DCACHE_INOTIFY_PARENT_WATCHED;
return;
}

Expand Down

0 comments on commit ac1257a

Please sign in to comment.