diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
| commit | 0a7d5f8ce960e74fa22986bda4af488539796e49 (patch) | |
| tree | e29ad17808a5c3410518e22dae8dfe94801b59f3 /fs/inotify_user.c | |
| parent | 0165508c80a2b5d5268d9c5dfa9b30c534a33693 (diff) | |
| parent | dc709bd190c130b299ac19d596594256265c042a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/inotify_user.c')
| -rw-r--r-- | fs/inotify_user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/inotify_user.c b/fs/inotify_user.c index f2386442adee..017cb0f134d6 100644 --- a/fs/inotify_user.c +++ b/fs/inotify_user.c | |||
| @@ -187,7 +187,7 @@ static struct inotify_kernel_event * kernel_event(s32 wd, u32 mask, u32 cookie, | |||
| 187 | { | 187 | { |
| 188 | struct inotify_kernel_event *kevent; | 188 | struct inotify_kernel_event *kevent; |
| 189 | 189 | ||
| 190 | kevent = kmem_cache_alloc(event_cachep, GFP_KERNEL); | 190 | kevent = kmem_cache_alloc(event_cachep, GFP_NOFS); |
| 191 | if (unlikely(!kevent)) | 191 | if (unlikely(!kevent)) |
| 192 | return NULL; | 192 | return NULL; |
| 193 | 193 | ||