OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GFS2: Make gfs2_log_fake_buf() write the buffer too 

Since we always write the buffer directly after this function
returns, we might as well merge it into here. This is a clean
up in preparation for some further updates to the log code
which are coming soon.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
Steven Whitehouse 2012-04-03 15:04:22 +01:00
parent fdb76a4228
commit 14e5f1848d
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fs/gfs2/lops.c
View File

@ -208,15 +208,13 @@ static void gfs2_fake_write_endio(struct buffer_head *bh, int uptodate)
} }
/** /**
* gfs2_log_fake_buf - Build a fake buffer head to write metadata buffer to log * gfs2_log_write_buf - write metadata buffer to log
* @sdp: the filesystem * @sdp: the filesystem
* @data: the data the buffer_head should point to * @real: the in-place buffer head
* *
* Returns: the log buffer descriptor
*/ */
static struct buffer_head *gfs2_log_fake_buf(struct gfs2_sbd *sdp, static void gfs2_log_write_buf(struct gfs2_sbd *sdp, struct buffer_head *real)
struct buffer_head *real)
{ {
u64 blkno = gfs2_log_bmap(sdp, sdp->sd_log_flush_head); u64 blkno = gfs2_log_bmap(sdp, sdp->sd_log_flush_head);
struct buffer_head *bh; struct buffer_head *bh;
@ -234,7 +232,7 @@ static struct buffer_head *gfs2_log_fake_buf(struct gfs2_sbd *sdp,
gfs2_log_incr_head(sdp); gfs2_log_incr_head(sdp);
atomic_inc(&sdp->sd_log_in_flight); atomic_inc(&sdp->sd_log_in_flight);
return bh; submit_bh(WRITE, bh);
} }
static struct buffer_head *gfs2_get_log_desc(struct gfs2_sbd *sdp, u32 ld_type) static struct buffer_head *gfs2_get_log_desc(struct gfs2_sbd *sdp, u32 ld_type)
@ -321,7 +319,7 @@ static void buf_lo_before_commit(struct gfs2_sbd *sdp)
} }
gfs2_log_unlock(sdp); gfs2_log_unlock(sdp);
submit_bh(WRITE_SYNC, bh); submit_bh(WRITE, bh);
gfs2_log_lock(sdp); gfs2_log_lock(sdp);
n = 0; n = 0;
@ -330,8 +328,7 @@ static void buf_lo_before_commit(struct gfs2_sbd *sdp)
get_bh(bd2->bd_bh); get_bh(bd2->bd_bh);
gfs2_log_unlock(sdp); gfs2_log_unlock(sdp);
lock_buffer(bd2->bd_bh); lock_buffer(bd2->bd_bh);
bh = gfs2_log_fake_buf(sdp, bd2->bd_bh); gfs2_log_write_buf(sdp, bd2->bd_bh);
submit_bh(WRITE_SYNC, bh);
gfs2_log_lock(sdp); gfs2_log_lock(sdp);
if (++n >= num) if (++n >= num)
break; break;
@ -475,7 +472,7 @@ static void revoke_lo_before_commit(struct gfs2_sbd *sdp)
sdp->sd_log_num_revoke--; sdp->sd_log_num_revoke--;
if (offset + sizeof(u64) > sdp->sd_sb.sb_bsize) { if (offset + sizeof(u64) > sdp->sd_sb.sb_bsize) {
submit_bh(WRITE_SYNC, bh); submit_bh(WRITE, bh);
bh = gfs2_log_get_buf(sdp); bh = gfs2_log_get_buf(sdp);
mh = (struct gfs2_meta_header *)bh->b_data; mh = (struct gfs2_meta_header *)bh->b_data;
@ -490,7 +487,7 @@ static void revoke_lo_before_commit(struct gfs2_sbd *sdp)
} }
gfs2_assert_withdraw(sdp, !sdp->sd_log_num_revoke); gfs2_assert_withdraw(sdp, !sdp->sd_log_num_revoke);
submit_bh(WRITE_SYNC, bh); submit_bh(WRITE, bh);
} }
static void revoke_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_ail *ai) static void revoke_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_ail *ai)
@ -672,7 +669,7 @@ static void gfs2_write_blocks(struct gfs2_sbd *sdp, struct buffer_head *bh,
ptr = bh_log_ptr(bh); ptr = bh_log_ptr(bh);
get_bh(bh); get_bh(bh);
submit_bh(WRITE_SYNC, bh); submit_bh(WRITE, bh);
gfs2_log_lock(sdp); gfs2_log_lock(sdp);
while(!list_empty(list)) { while(!list_empty(list)) {
bd = list_entry(list->next, struct gfs2_bufdata, bd_le.le_list); bd = list_entry(list->next, struct gfs2_bufdata, bd_le.le_list);
@ -695,10 +692,10 @@ static void gfs2_write_blocks(struct gfs2_sbd *sdp, struct buffer_head *bh,
clear_buffer_escaped(bd->bd_bh); clear_buffer_escaped(bd->bd_bh);
unlock_buffer(bd->bd_bh); unlock_buffer(bd->bd_bh);
brelse(bd->bd_bh); brelse(bd->bd_bh);
submit_bh(WRITE, bh1);
} else { } else {
bh1 = gfs2_log_fake_buf(sdp, bd->bd_bh); gfs2_log_write_buf(sdp, bd->bd_bh);
} }
submit_bh(WRITE_SYNC, bh1);
gfs2_log_lock(sdp); gfs2_log_lock(sdp);
ptr += 2; ptr += 2;
} }