diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-04-13 12:19:30 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-04-13 12:19:30 +1000 |
| commit | 41d08c47b95dbdf15ba9030092042c8adda96ab1 (patch) | |
| tree | 29c414c151c23544cdb5e2ef61f0ee9d54e5fadd /fs/notify/inotify/inotify_fsnotify.c | |
| parent | c0a3c4ac336f5d9009b1569982c6b02c72dc729a (diff) | |
| parent | 2f74fd9f6655229b70f488fdab65ec3df14d863a (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'fs/notify/inotify/inotify_fsnotify.c')
| -rw-r--r-- | fs/notify/inotify/inotify_fsnotify.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c index 40dedb37a1f3..b184bff93d02 100644 --- a/fs/notify/inotify/inotify_fsnotify.c +++ b/fs/notify/inotify/inotify_fsnotify.c @@ -98,7 +98,7 @@ int inotify_handle_event(struct fsnotify_group *group, i_mark = container_of(inode_mark, struct inotify_inode_mark, fsn_mark); - event = kmalloc(alloc_len, GFP_KERNEL); + event = kmalloc_memcg(alloc_len, GFP_KERNEL, group->memcg); if (unlikely(!event)) { /* * Treat lost event due to ENOMEM the same way as queue |