diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-27 15:54:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-27 15:54:10 -0700 |
| commit | fc013a58859b7cf85e53a05804a74952fe0a4117 (patch) | |
| tree | 012d671d822c281edef18f00992ec8c9ea4b0893 /fs/notify/fsnotify.c | |
| parent | 3a54297478e6578f96fd54bf4daa1751130aca86 (diff) | |
| parent | f44aebcc566d1d6275f7191867b9633dc11de2ee (diff) | |
| download | talos-op-linux-fc013a58859b7cf85e53a05804a74952fe0a4117.tar.gz talos-op-linux-fc013a58859b7cf85e53a05804a74952fe0a4117.zip | |
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
* 'for-linus' of git://git.infradead.org/users/eparis/notify:
inotify: use GFP_NOFS under potential memory pressure
fsnotify: fix inotify tail drop check with path entries
inotify: check filename before dropping repeat events
fsnotify: use def_bool in kconfig instead of letting the user choose
inotify: fix error paths in inotify_update_watch
inotify: do not leak inode marks in inotify_add_watch
inotify: drop user watch count when a watch is removed
Diffstat (limited to 'fs/notify/fsnotify.c')
| -rw-r--r-- | fs/notify/fsnotify.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c index ec2f7bd76818..037e878e03fc 100644 --- a/fs/notify/fsnotify.c +++ b/fs/notify/fsnotify.c @@ -159,7 +159,9 @@ void fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is, const if (!group->ops->should_send_event(group, to_tell, mask)) continue; if (!event) { - event = fsnotify_create_event(to_tell, mask, data, data_is, file_name, cookie); + event = fsnotify_create_event(to_tell, mask, data, + data_is, file_name, cookie, + GFP_KERNEL); /* shit, we OOM'd and now we can't tell, maybe * someday someone else will want to do something * here */ |
