Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

fs/ocfs2/dlm/dlmdomain.c

+1 −1
Original line number Diff line number Diff line
@@ -959,7 +959,7 @@ static int dlm_match_regions(struct dlm_ctxt *dlm, 
		r += O2HB_MAX_REGION_NAME_LEN;

	}



	local = kmalloc(sizeof(qr->qr_regions), GFP_KERNEL);

	local = kmalloc(sizeof(qr->qr_regions), GFP_ATOMIC);

	if (!local) {

		status = -ENOMEM;

		goto bail;