Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / fs / inotify.c

diff --git a/fs/inotify.c b/fs/inotify.c
index 27ebcac5e07ff8f67afe7594d25aa5d384814951..868901b1e779301c5bae15911ae89dcc49aa2fe8 100644 (file)
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -402,7 +402,7 @@ static struct inotify_watch *create_watch(struct inotify_device *dev,
                return ERR_PTR(ret);
        }
 
-       dev->last_wd = ret;
+       dev->last_wd = watch->wd;
        watch->mask = mask;
        atomic_set(&watch->count, 0);
        INIT_LIST_HEAD(&watch->d_list);