commit dd894be8df11ea40a1163b75596ab85d558816c8
author Steven Whitehouse <swhiteho@redhat.com> Thu Jul 27 14:29:00 2006 -0400
committer Steven Whitehouse <swhiteho@redhat.com> Thu Jul 27 14:29:00 2006 -0400
tree 3d40979d6139a0f402481afb0f4b52506eb6d05d
parent f45b7ddd2bae1dc98e35c3611b55cba6d2a8da9e

[GFS2] Change some allocations to GFP_NOFS

Some allocations in rgrp.c should have been GFP_NOFS
rather than GFP_KERNEL.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

fs/gfs2/rgrp.c

diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 65eea0b..4e0357d 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -374,7 +374,7 @@
 	if (!length)
 		return -EINVAL;
 
-	rgd->rd_bits = kcalloc(length, sizeof(struct gfs2_bitmap), GFP_KERNEL);
+	rgd->rd_bits = kcalloc(length, sizeof(struct gfs2_bitmap), GFP_NOFS);
 	if (!rgd->rd_bits)
 		return -ENOMEM;
 
@@ -467,7 +467,7 @@
 			goto fail;
 		}
 
-		rgd = kzalloc(sizeof(struct gfs2_rgrpd), GFP_KERNEL);
+		rgd = kzalloc(sizeof(struct gfs2_rgrpd), GFP_NOFS);
 		error = -ENOMEM;
 		if (!rgd)
 			goto fail;
@@ -1184,14 +1184,13 @@
 
 		if (!bi->bi_clone) {
 			bi->bi_clone = kmalloc(bi->bi_bh->b_size,
-					       GFP_KERNEL | __GFP_NOFAIL);
+					       GFP_NOFS | __GFP_NOFAIL);
 			memcpy(bi->bi_clone + bi->bi_offset,
 			       bi->bi_bh->b_data + bi->bi_offset,
 			       bi->bi_len);
 		}
 		gfs2_trans_add_bh(rgd->rd_gl, bi->bi_bh, 1);
-		gfs2_setbit(rgd,
-			    bi->bi_bh->b_data + bi->bi_offset,
+		gfs2_setbit(rgd, bi->bi_bh->b_data + bi->bi_offset,
 			    bi->bi_len, buf_blk, new_state);
 	}
 
@@ -1469,7 +1468,7 @@
 		new_space = rlist->rl_space + 10;
 
 		tmp = kcalloc(new_space, sizeof(struct gfs2_rgrpd *),
-			      GFP_KERNEL | __GFP_NOFAIL);
+			      GFP_NOFS | __GFP_NOFAIL);
 
 		if (rlist->rl_rgd) {
 			memcpy(tmp, rlist->rl_rgd,
@@ -1501,7 +1500,7 @@
 	unsigned int x;
 
 	rlist->rl_ghs = kcalloc(rlist->rl_rgrps, sizeof(struct gfs2_holder),
-				GFP_KERNEL | __GFP_NOFAIL);
+				GFP_NOFS | __GFP_NOFAIL);
 	for (x = 0; x < rlist->rl_rgrps; x++)
 		gfs2_holder_init(rlist->rl_rgd[x]->rd_gl,
 				state, flags,