summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-07-26 16:05:05 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2013-02-26 02:46:13 -0500
commitb24ae0b54be4e46bb88398f29c5f79c5dad2a602 (patch)
tree0a663c0b56132f471b1454be60e6ea97ed4fbbec /fs/ocfs2
parent9b171e0c74ca0549d0610990a862dd895870f04a (diff)
downloadlinux-stable-b24ae0b54be4e46bb88398f29c5f79c5dad2a602.tar.gz
linux-stable-b24ae0b54be4e46bb88398f29c5f79c5dad2a602.tar.bz2
linux-stable-b24ae0b54be4e46bb88398f29c5f79c5dad2a602.zip
ocfs2/dlm: use GFP_ATOMIC inside a spin_lock
My static checker complains that this is called with a spin_lock held in dlm_master_requery_handler() from dlmrecovery.c. Probably the reason we have not received any bug reports about this is that recovery is not a common operation. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Joel Becker <jlbec@evilplan.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/dlm/dlmmaster.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 005261c333b0..33ecbe0e6734 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -2020,7 +2020,7 @@ int dlm_dispatch_assert_master(struct dlm_ctxt *dlm,
int ignore_higher, u8 request_from, u32 flags)
{
struct dlm_work_item *item;
- item = kzalloc(sizeof(*item), GFP_NOFS);
+ item = kzalloc(sizeof(*item), GFP_ATOMIC);
if (!item)
return -ENOMEM;