diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-15 16:02:50 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-15 16:02:50 -0400 |
| commit | fb80cbee4c4bfeaeb2ff6611beecfb9a2443da90 (patch) | |
| tree | 6e412d032cca4ddb50b8628b4bbecea120d316a7 /fs/inotify.c | |
| parent | b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae (diff) | |
| parent | 3edea4833a1efcd43e1dff082bc8001fdfe74b34 (diff) | |
Merge ../from-linus
Diffstat (limited to 'fs/inotify.c')
| -rw-r--r-- | fs/inotify.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/inotify.c b/fs/inotify.c index 27ebcac5e07..868901b1e77 100644 --- 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); |