aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSteven Whitehouse <steve@chygwyn.com>2006-01-18 08:20:16 -0500
committerSteven Whitehouse <steve@chygwyn.com>2006-01-18 08:20:16 -0500
commit4f3df04137d426a0ad1758ab744f5b6d658617bf (patch)
tree15665b5278481508d72ecd45b79cd400aa5438f1 /fs
parent64fb4eb7d4cc9de89f4d9b9061adde46ed3b5641 (diff)
[GFS2] Change memory allocations to GFP_NOFS
I'd like to be rid of these memory allocations entirely so far as is possible. For the moment though, mark them GFP_NOFS to make them less harmful. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/log.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index 736d0d33dd1b..f6d00130f96f 100644
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -350,7 +350,7 @@ struct buffer_head *gfs2_log_get_buf(struct gfs2_sbd *sdp)
350 struct gfs2_log_buf *lb; 350 struct gfs2_log_buf *lb;
351 struct buffer_head *bh; 351 struct buffer_head *bh;
352 352
353 lb = kzalloc(sizeof(struct gfs2_log_buf), GFP_KERNEL | __GFP_NOFAIL); 353 lb = kzalloc(sizeof(struct gfs2_log_buf), GFP_NOFS | __GFP_NOFAIL);
354 list_add(&lb->lb_list, &sdp->sd_log_flush_list); 354 list_add(&lb->lb_list, &sdp->sd_log_flush_list);
355 355
356 bh = lb->lb_bh = sb_getblk(sdp->sd_vfs, blkno); 356 bh = lb->lb_bh = sb_getblk(sdp->sd_vfs, blkno);
@@ -380,7 +380,7 @@ struct buffer_head *gfs2_log_fake_buf(struct gfs2_sbd *sdp,
380 struct gfs2_log_buf *lb; 380 struct gfs2_log_buf *lb;
381 struct buffer_head *bh; 381 struct buffer_head *bh;
382 382
383 lb = kzalloc(sizeof(struct gfs2_log_buf), GFP_KERNEL | __GFP_NOFAIL); 383 lb = kzalloc(sizeof(struct gfs2_log_buf), GFP_NOFS | __GFP_NOFAIL);
384 list_add(&lb->lb_list, &sdp->sd_log_flush_list); 384 list_add(&lb->lb_list, &sdp->sd_log_flush_list);
385 lb->lb_real = real; 385 lb->lb_real = real;
386 386
@@ -510,7 +510,7 @@ void gfs2_log_flush_i(struct gfs2_sbd *sdp, struct gfs2_glock *gl)
510 510
511 atomic_inc(&sdp->sd_log_flush_incore); 511 atomic_inc(&sdp->sd_log_flush_incore);
512 512
513 ai = kzalloc(sizeof(struct gfs2_ail), GFP_KERNEL | __GFP_NOFAIL); 513 ai = kzalloc(sizeof(struct gfs2_ail), GFP_NOFS | __GFP_NOFAIL);
514 INIT_LIST_HEAD(&ai->ai_ail1_list); 514 INIT_LIST_HEAD(&ai->ai_ail1_list);
515 INIT_LIST_HEAD(&ai->ai_ail2_list); 515 INIT_LIST_HEAD(&ai->ai_ail2_list);
516 516