diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-18 22:14:39 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-18 22:14:39 -0400 |
| commit | a3bc068022b968a3042b48eb9a8e8b0418fb9cdd (patch) | |
| tree | 6bbc2806756924105802f4584157396fb98d282c /fs/inotify.c | |
| parent | 54cfb5aa0f4859bd38706eabe0118175780a542f (diff) | |
| parent | 91aa9fb573fcc50bc74d5ee64c7e9b36131f1804 (diff) | |
Merge /spare/repo/linux-2.6/
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 27ebcac5e07f..868901b1e779 100644 --- a/fs/inotify.c +++ b/fs/inotify.c | |||
| @@ -402,7 +402,7 @@ static struct inotify_watch *create_watch(struct inotify_device *dev, | |||
| 402 | return ERR_PTR(ret); | 402 | return ERR_PTR(ret); |
| 403 | } | 403 | } |
| 404 | 404 | ||
| 405 | dev->last_wd = ret; | 405 | dev->last_wd = watch->wd; |
| 406 | watch->mask = mask; | 406 | watch->mask = mask; |
| 407 | atomic_set(&watch->count, 0); | 407 | atomic_set(&watch->count, 0); |
| 408 | INIT_LIST_HEAD(&watch->d_list); | 408 | INIT_LIST_HEAD(&watch->d_list); |