diff options
| author | David Sterba <dsterba@suse.cz> | 2010-11-02 23:36:02 +0100 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-11-18 14:10:55 -0800 |
| commit | a48a982a6bd3896274dd643397c72da9258411e2 (patch) | |
| tree | d94208ff3ec315325eef3eaf365a9d71451ba3b2 | |
| parent | 2811036a19624168ff9342bb85421dbbb1d2ac0d (diff) | |
| download | op-kernel-dev-a48a982a6bd3896274dd643397c72da9258411e2.zip op-kernel-dev-a48a982a6bd3896274dd643397c72da9258411e2.tar.gz | |
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: 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>
| -rw-r--r-- | fs/ocfs2/dlm/dlmdomain.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c index 58a93b9..cc2aaa9 100644 --- a/fs/ocfs2/dlm/dlmdomain.c +++ b/fs/ocfs2/dlm/dlmdomain.c @@ -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; |
