mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-22 14:41:27 +00:00
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>
This commit is contained in:
parent
cf15900e12
commit
721a9602e6
24 changed files with 43 additions and 75 deletions
|
@ -137,9 +137,9 @@ static int journal_submit_commit_record(journal_t *journal,
|
|||
if (journal->j_flags & JBD2_BARRIER &&
|
||||
!JBD2_HAS_INCOMPAT_FEATURE(journal,
|
||||
JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT))
|
||||
ret = submit_bh(WRITE_SYNC_PLUG | WRITE_FLUSH_FUA, bh);
|
||||
ret = submit_bh(WRITE_SYNC | WRITE_FLUSH_FUA, bh);
|
||||
else
|
||||
ret = submit_bh(WRITE_SYNC_PLUG, bh);
|
||||
ret = submit_bh(WRITE_SYNC, bh);
|
||||
|
||||
*cbh = bh;
|
||||
return ret;
|
||||
|
@ -369,7 +369,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
|
|||
* instead we rely on sync_buffer() doing the unplug for us.
|
||||
*/
|
||||
if (commit_transaction->t_synchronous_commit)
|
||||
write_op = WRITE_SYNC_PLUG;
|
||||
write_op = WRITE_SYNC;
|
||||
trace_jbd2_commit_locking(journal, commit_transaction);
|
||||
stats.run.rs_wait = commit_transaction->t_max_wait;
|
||||
stats.run.rs_locked = jiffies;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue