diff options
Diffstat (limited to 'fs/gfs2')
-rw-r--r-- | fs/gfs2/log.c | 4 | ||||
-rw-r--r-- | fs/gfs2/lops.c | 12 | ||||
-rw-r--r-- | fs/gfs2/meta_io.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index eb01f3575e10..7f1c11202342 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c | |||
@@ -121,7 +121,7 @@ __acquires(&sdp->sd_log_lock) | |||
121 | lock_buffer(bh); | 121 | lock_buffer(bh); |
122 | if (test_clear_buffer_dirty(bh)) { | 122 | if (test_clear_buffer_dirty(bh)) { |
123 | bh->b_end_io = end_buffer_write_sync; | 123 | bh->b_end_io = end_buffer_write_sync; |
124 | submit_bh(WRITE_SYNC_PLUG, bh); | 124 | submit_bh(WRITE_SYNC, bh); |
125 | } else { | 125 | } else { |
126 | unlock_buffer(bh); | 126 | unlock_buffer(bh); |
127 | brelse(bh); | 127 | brelse(bh); |
@@ -647,7 +647,7 @@ static void gfs2_ordered_write(struct gfs2_sbd *sdp) | |||
647 | lock_buffer(bh); | 647 | lock_buffer(bh); |
648 | if (buffer_mapped(bh) && test_clear_buffer_dirty(bh)) { | 648 | if (buffer_mapped(bh) && test_clear_buffer_dirty(bh)) { |
649 | bh->b_end_io = end_buffer_write_sync; | 649 | bh->b_end_io = end_buffer_write_sync; |
650 | submit_bh(WRITE_SYNC_PLUG, bh); | 650 | submit_bh(WRITE_SYNC, bh); |
651 | } else { | 651 | } else { |
652 | unlock_buffer(bh); | 652 | unlock_buffer(bh); |
653 | brelse(bh); | 653 | brelse(bh); |
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c index bf33f822058d..48b545a1979a 100644 --- a/fs/gfs2/lops.c +++ b/fs/gfs2/lops.c | |||
@@ -200,7 +200,7 @@ static void buf_lo_before_commit(struct gfs2_sbd *sdp) | |||
200 | } | 200 | } |
201 | 201 | ||
202 | gfs2_log_unlock(sdp); | 202 | gfs2_log_unlock(sdp); |
203 | submit_bh(WRITE_SYNC_PLUG, bh); | 203 | submit_bh(WRITE_SYNC, bh); |
204 | gfs2_log_lock(sdp); | 204 | gfs2_log_lock(sdp); |
205 | 205 | ||
206 | n = 0; | 206 | n = 0; |
@@ -210,7 +210,7 @@ static void buf_lo_before_commit(struct gfs2_sbd *sdp) | |||
210 | gfs2_log_unlock(sdp); | 210 | gfs2_log_unlock(sdp); |
211 | lock_buffer(bd2->bd_bh); | 211 | lock_buffer(bd2->bd_bh); |
212 | bh = gfs2_log_fake_buf(sdp, bd2->bd_bh); | 212 | bh = gfs2_log_fake_buf(sdp, bd2->bd_bh); |
213 | submit_bh(WRITE_SYNC_PLUG, bh); | 213 | submit_bh(WRITE_SYNC, bh); |
214 | gfs2_log_lock(sdp); | 214 | gfs2_log_lock(sdp); |
215 | if (++n >= num) | 215 | if (++n >= num) |
216 | break; | 216 | break; |
@@ -352,7 +352,7 @@ static void revoke_lo_before_commit(struct gfs2_sbd *sdp) | |||
352 | sdp->sd_log_num_revoke--; | 352 | sdp->sd_log_num_revoke--; |
353 | 353 | ||
354 | if (offset + sizeof(u64) > sdp->sd_sb.sb_bsize) { | 354 | if (offset + sizeof(u64) > sdp->sd_sb.sb_bsize) { |
355 | submit_bh(WRITE_SYNC_PLUG, bh); | 355 | submit_bh(WRITE_SYNC, bh); |
356 | 356 | ||
357 | bh = gfs2_log_get_buf(sdp); | 357 | bh = gfs2_log_get_buf(sdp); |
358 | mh = (struct gfs2_meta_header *)bh->b_data; | 358 | mh = (struct gfs2_meta_header *)bh->b_data; |
@@ -369,7 +369,7 @@ static void revoke_lo_before_commit(struct gfs2_sbd *sdp) | |||
369 | } | 369 | } |
370 | gfs2_assert_withdraw(sdp, !sdp->sd_log_num_revoke); | 370 | gfs2_assert_withdraw(sdp, !sdp->sd_log_num_revoke); |
371 | 371 | ||
372 | submit_bh(WRITE_SYNC_PLUG, bh); | 372 | submit_bh(WRITE_SYNC, bh); |
373 | } | 373 | } |
374 | 374 | ||
375 | static void revoke_lo_before_scan(struct gfs2_jdesc *jd, | 375 | static void revoke_lo_before_scan(struct gfs2_jdesc *jd, |
@@ -571,7 +571,7 @@ static void gfs2_write_blocks(struct gfs2_sbd *sdp, struct buffer_head *bh, | |||
571 | ptr = bh_log_ptr(bh); | 571 | ptr = bh_log_ptr(bh); |
572 | 572 | ||
573 | get_bh(bh); | 573 | get_bh(bh); |
574 | submit_bh(WRITE_SYNC_PLUG, bh); | 574 | submit_bh(WRITE_SYNC, bh); |
575 | gfs2_log_lock(sdp); | 575 | gfs2_log_lock(sdp); |
576 | while(!list_empty(list)) { | 576 | while(!list_empty(list)) { |
577 | bd = list_entry(list->next, struct gfs2_bufdata, bd_le.le_list); | 577 | bd = list_entry(list->next, struct gfs2_bufdata, bd_le.le_list); |
@@ -597,7 +597,7 @@ static void gfs2_write_blocks(struct gfs2_sbd *sdp, struct buffer_head *bh, | |||
597 | } else { | 597 | } else { |
598 | bh1 = gfs2_log_fake_buf(sdp, bd->bd_bh); | 598 | bh1 = gfs2_log_fake_buf(sdp, bd->bd_bh); |
599 | } | 599 | } |
600 | submit_bh(WRITE_SYNC_PLUG, bh1); | 600 | submit_bh(WRITE_SYNC, bh1); |
601 | gfs2_log_lock(sdp); | 601 | gfs2_log_lock(sdp); |
602 | ptr += 2; | 602 | ptr += 2; |
603 | } | 603 | } |
diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c index a566331db4e1..867b713cba92 100644 --- a/fs/gfs2/meta_io.c +++ b/fs/gfs2/meta_io.c | |||
@@ -37,7 +37,7 @@ static int gfs2_aspace_writepage(struct page *page, struct writeback_control *wb | |||
37 | struct buffer_head *bh, *head; | 37 | struct buffer_head *bh, *head; |
38 | int nr_underway = 0; | 38 | int nr_underway = 0; |
39 | int write_op = REQ_META | | 39 | int write_op = REQ_META | |
40 | (wbc->sync_mode == WB_SYNC_ALL ? WRITE_SYNC_PLUG : WRITE); | 40 | (wbc->sync_mode == WB_SYNC_ALL ? WRITE_SYNC : WRITE); |
41 | 41 | ||
42 | BUG_ON(!PageLocked(page)); | 42 | BUG_ON(!PageLocked(page)); |
43 | BUG_ON(!page_has_buffers(page)); | 43 | BUG_ON(!page_has_buffers(page)); |