From dd449db10ee550d3c88d15cb5f20a717d623ae7a Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Wed, 18 Jan 2006 13:20:16 +0000 Subject: [PATCH] --- yaml --- r: 38589 b: refs/heads/master c: 4f3df04137d426a0ad1758ab744f5b6d658617bf h: refs/heads/master i: 38587: 7ccd7a00ce4244baaf8bab1b2cb127ff415f08fd v: v3 --- [refs] | 2 +- trunk/fs/gfs2/log.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 94c0d2c7559f..8451f99af6d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64fb4eb7d4cc9de89f4d9b9061adde46ed3b5641 +refs/heads/master: 4f3df04137d426a0ad1758ab744f5b6d658617bf diff --git a/trunk/fs/gfs2/log.c b/trunk/fs/gfs2/log.c index 736d0d33dd1b..f6d00130f96f 100644 --- a/trunk/fs/gfs2/log.c +++ b/trunk/fs/gfs2/log.c @@ -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);