---

yaml --- r: 26855 b: refs/heads/master c: d66fd90 h: refs/heads/master i: 26853: 77b07f2 26851: d6ee116 26847: 84aa454 v: v3
git-mirror · May 21, 2006 · ac3b123 · ac3b123
1 parent 32543cb
commit ac3b123
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66055a4e7334b05354c835123ff621c5f700e56a
+refs/heads/master: d66fd908acc8ba88541ecc570d89b0243f947c5e
diff --git a/trunk/fs/inotify.c b/trunk/fs/inotify.c
@@ -894,8 +894,7 @@ static int inotify_ignore(struct inotify_device *dev, s32 wd)
 	mutex_lock(&dev->mutex);
 
 	/* make sure that we did not race */
-	watch = idr_find(&dev->idr, wd);
-	if (likely(watch))
+	if (likely(idr_find(&dev->idr, wd) == watch))
 		remove_watch(watch, dev);
 
 	mutex_unlock(&dev->mutex);