]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
fs/ocfs2/dlm: Use GFP_ATOMIC under spin_lock
authorDavid Sterba <dsterba@suse.cz>
Tue, 2 Nov 2010 22:36:02 +0000 (23:36 +0100)
committerJoel Becker <joel.becker@oracle.com>
Thu, 18 Nov 2010 22:10:55 +0000 (14:10 -0800)
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: David 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: Joel Becker <joel.becker@oracle.com>
fs/ocfs2/dlm/dlmdomain.c

index 58a93b953735ebcaeda134794195449da4e98a53..cc2aaa96cfe5c58540c23f863701102a0c8096a8 100644 (file)
@@ -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;