From de7e156e992c532626a4e7085baaefa45a207dd5 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Sun, 30 Jul 2006 03:03:54 -0700 Subject: [PATCH] --- yaml --- r: 32955 b: refs/heads/master c: 5b6509aa8c2f292caea7c0602ec361f920951508 h: refs/heads/master i: 32953: cbc5238ad8f8f753c4a5b430c4fae2ce38f8636e 32951: cf36784a08bc54b032845c38dbc5b2bf50315af9 v: v3 --- [refs] | 2 +- trunk/fs/inotify_user.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 704e9b8295bc..095bbbe46b98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70ea91f17f7454bc7a285817e883eace2597984f +refs/heads/master: 5b6509aa8c2f292caea7c0602ec361f920951508 diff --git a/trunk/fs/inotify_user.c b/trunk/fs/inotify_user.c index f2386442adee..017cb0f134d6 100644 --- a/trunk/fs/inotify_user.c +++ b/trunk/fs/inotify_user.c @@ -187,7 +187,7 @@ static struct inotify_kernel_event * kernel_event(s32 wd, u32 mask, u32 cookie, { struct inotify_kernel_event *kevent; - kevent = kmem_cache_alloc(event_cachep, GFP_KERNEL); + kevent = kmem_cache_alloc(event_cachep, GFP_NOFS); if (unlikely(!kevent)) return NULL;