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);