From: Steven Whitehouse <swhiteho@redhat.com>
Date: Tue, 11 Jul 2006 13:50:54 +0000 (-0400)
Subject: [GFS2] Fix deadlock in memory allocation
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f3bba03fd16e25a262323293e5a07dea173c89f7;p=deliverable%2Flinux.git

[GFS2] Fix deadlock in memory allocation

We must not call GFP_KERNEL memory allocations while we
are holding the log lock (read or write) since that may
trigger a log flush resulting in a deadlock.

Eventually we need to fix the locking in log.c, for now
this solves the problem at the expense of freeing up memory
as fast as we would like to. This needs to be revisited
later on.

Cc: Kevin Anderson <kanderso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---

diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
index cad44fd70d67..42dfd32059bc 100644
--- a/fs/gfs2/meta_io.c
+++ b/fs/gfs2/meta_io.c
@@ -75,7 +75,7 @@ struct inode *gfs2_aspace_get(struct gfs2_sbd *sdp)
 
 	aspace = new_inode(sdp->sd_vfs);
 	if (aspace) {
-		mapping_set_gfp_mask(aspace->i_mapping, GFP_KERNEL);
+		mapping_set_gfp_mask(aspace->i_mapping, GFP_NOFS);
 		aspace->i_mapping->a_ops = &aspace_aops;
 		aspace->i_size = ~0ULL;
 		aspace->u.generic_ip = NULL;