diff options
-rw-r--r-- | fs/notify/inotify/inotify_user.c | 2 | ||||
-rw-r--r-- | kernel/auditfilter.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c index bed766e435b5..1634319e2404 100644 --- a/fs/notify/inotify/inotify_user.c +++ b/fs/notify/inotify/inotify_user.c | |||
@@ -220,7 +220,7 @@ static struct inotify_kernel_event * kernel_event(s32 wd, u32 mask, u32 cookie, | |||
220 | rem = 0; | 220 | rem = 0; |
221 | } | 221 | } |
222 | 222 | ||
223 | kevent->name = kmalloc(len + rem, GFP_KERNEL); | 223 | kevent->name = kmalloc(len + rem, GFP_NOFS); |
224 | if (unlikely(!kevent->name)) { | 224 | if (unlikely(!kevent->name)) { |
225 | kmem_cache_free(event_cachep, kevent); | 225 | kmem_cache_free(event_cachep, kevent); |
226 | return NULL; | 226 | return NULL; |
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index a6fe71fd5d1b..713098ee5a02 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c | |||
@@ -1028,7 +1028,7 @@ static void audit_update_watch(struct audit_parent *parent, | |||
1028 | 1028 | ||
1029 | if (audit_enabled) { | 1029 | if (audit_enabled) { |
1030 | struct audit_buffer *ab; | 1030 | struct audit_buffer *ab; |
1031 | ab = audit_log_start(NULL, GFP_KERNEL, | 1031 | ab = audit_log_start(NULL, GFP_NOFS, |
1032 | AUDIT_CONFIG_CHANGE); | 1032 | AUDIT_CONFIG_CHANGE); |
1033 | audit_log_format(ab, "auid=%u ses=%u", | 1033 | audit_log_format(ab, "auid=%u ses=%u", |
1034 | audit_get_loginuid(current), | 1034 | audit_get_loginuid(current), |
@@ -1067,7 +1067,7 @@ static void audit_remove_parent_watches(struct audit_parent *parent) | |||
1067 | e = container_of(r, struct audit_entry, rule); | 1067 | e = container_of(r, struct audit_entry, rule); |
1068 | if (audit_enabled) { | 1068 | if (audit_enabled) { |
1069 | struct audit_buffer *ab; | 1069 | struct audit_buffer *ab; |
1070 | ab = audit_log_start(NULL, GFP_KERNEL, | 1070 | ab = audit_log_start(NULL, GFP_NOFS, |
1071 | AUDIT_CONFIG_CHANGE); | 1071 | AUDIT_CONFIG_CHANGE); |
1072 | audit_log_format(ab, "auid=%u ses=%u", | 1072 | audit_log_format(ab, "auid=%u ses=%u", |
1073 | audit_get_loginuid(current), | 1073 | audit_get_loginuid(current), |