From ac3b1236e3abe949c405564b1200b582f4904cd6 Mon Sep 17 00:00:00 2001
From: Amy Griffis <amy.griffis@hp.com>
Date: Sat, 20 May 2006 15:00:07 -0700
Subject: [PATCH] --- yaml --- r: 26855 b: refs/heads/master c:
 d66fd908acc8ba88541ecc570d89b0243f947c5e h: refs/heads/master i:   26853:
 77b07f26128f297d0a767d1cc81f96073f6b3ff4   26851:
 d6ee116353b5cbdccd9b73ab9f09a9ceeb760334   26847:
 84aa4549a2dcec2d0ee462c673b874547092acb5 v: v3

---
 [refs]             | 2 +-
 trunk/fs/inotify.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index fc09766171d8..9bd8d9e9d89f 100644
--- 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
index 7d5725336527..732ec4bd5774 100644
--- 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);