diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-17 09:37:55 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-17 09:37:55 -0400 |
| commit | 327b6b08d6ab3bf5488120ba02ed2fe06b09efe6 (patch) | |
| tree | 592b0ebc2f5f18dac0bdc0fd6ba87d2c8b07b232 /fs/inotify.c | |
| parent | c973b112c76c9d8fd042991128f218a738cc8d0a (diff) | |
| parent | 2ad56496627630ebc99f06af5f81ca23e17e014e (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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); |