[GFS2] Change memory allocations to GFP_NOFS
authorSteven Whitehouse <steve@chygwyn.com>
Wed, 18 Jan 2006 13:20:16 +0000 (13:20 +0000)
committerSteven Whitehouse <steve@chygwyn.com>
Wed, 18 Jan 2006 13:20:16 +0000 (13:20 +0000)
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>
fs/gfs2/log.c

index 736d0d33dd1bef781fcdf9e5f563baf31bda7a69..f6d00130f96fd60d5a0bba94826398dfd67e0093 100644 (file)
@@ -350,7 +350,7 @@ struct buffer_head *gfs2_log_get_buf(struct gfs2_sbd *sdp)
        struct gfs2_log_buf *lb;
        struct buffer_head *bh;
 
-       lb = kzalloc(sizeof(struct gfs2_log_buf), GFP_KERNEL | __GFP_NOFAIL);
+       lb = kzalloc(sizeof(struct gfs2_log_buf), GFP_NOFS | __GFP_NOFAIL);
        list_add(&lb->lb_list, &sdp->sd_log_flush_list);
 
        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,
        struct gfs2_log_buf *lb;
        struct buffer_head *bh;
 
-       lb = kzalloc(sizeof(struct gfs2_log_buf), GFP_KERNEL | __GFP_NOFAIL);
+       lb = kzalloc(sizeof(struct gfs2_log_buf), GFP_NOFS | __GFP_NOFAIL);
        list_add(&lb->lb_list, &sdp->sd_log_flush_list);
        lb->lb_real = real;
 
@@ -510,7 +510,7 @@ void gfs2_log_flush_i(struct gfs2_sbd *sdp, struct gfs2_glock *gl)
 
        atomic_inc(&sdp->sd_log_flush_incore);
 
-       ai = kzalloc(sizeof(struct gfs2_ail), GFP_KERNEL | __GFP_NOFAIL);
+       ai = kzalloc(sizeof(struct gfs2_ail), GFP_NOFS | __GFP_NOFAIL);
        INIT_LIST_HEAD(&ai->ai_ail1_list);
        INIT_LIST_HEAD(&ai->ai_ail2_list);