diff options
author | Jens Axboe <jaxboe@fusionio.com> | 2011-03-09 05:56:30 -0500 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2011-03-10 02:52:27 -0500 |
commit | 721a9602e6607417c6bc15b18e97a2f35266c690 (patch) | |
tree | 4987991e43f35b8b3b685fea0040c5265b578996 /fs/gfs2/lops.c | |
parent | cf15900e1209d5b46ec2d24643adbf561830935f (diff) |
block: kill off REQ_UNPLUG
With the plugging now being explicitly controlled by the
submitter, callers need not pass down unplugging hints
to the block layer. If they want to unplug, it's because they
manually plugged on their own - in which case, they should just
unplug at will.
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'fs/gfs2/lops.c')
-rw-r--r-- | fs/gfs2/lops.c | 12 |
1 files changed, 6 insertions, 6 deletions
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 | } |