Commit a48a982a authored by David Sterba's avatar David Sterba Committed by Joel Becker

fs/ocfs2/dlm: Use GFP_ATOMIC under spin_lock

coccinelle check scripts/coccinelle/locks/call_kern.cocci found that
in fs/ocfs2/dlm/dlmdomain.c an allocation with GFP_KERNEL is done
with locks held:

dlm_query_region_handler
  spin_lock(dlm_domain_lock)
    dlm_match_regions
      kmalloc(GFP_KERNEL)

Change it to GFP_ATOMIC.
Signed-off-by: default avatarDavid Sterba <dsterba@suse.cz>
CC: Joel Becker <joel.becker@oracle.com>
CC: Mark Fasheh <mfasheh@suse.com>
CC: ocfs2-devel@oss.oracle.com

--
Exists in v2.6.37-rc1 and current linux-next.
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent 2811036a
...@@ -959,7 +959,7 @@ static int dlm_match_regions(struct dlm_ctxt *dlm, ...@@ -959,7 +959,7 @@ static int dlm_match_regions(struct dlm_ctxt *dlm,
r += O2HB_MAX_REGION_NAME_LEN; r += O2HB_MAX_REGION_NAME_LEN;
} }
local = kmalloc(sizeof(qr->qr_regions), GFP_KERNEL); local = kmalloc(sizeof(qr->qr_regions), GFP_ATOMIC);
if (!local) { if (!local) {
status = -ENOMEM; status = -ENOMEM;
goto bail; goto bail;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment