diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-15 16:07:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-15 16:07:26 -0400 |
| commit | 09d92002718edf8ef284ec3726247acc83efbbe0 (patch) | |
| tree | 54fe60e08833214565562ce0e9cefa21c92f95e3 /fs/inotify.c | |
| parent | cb220c1af49644786944c549518b491d4c654030 (diff) | |
| parent | 3edea4833a1efcd43e1dff082bc8001fdfe74b34 (diff) | |
Merge from-linus to-akpm
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); |