mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull more block fixes from Jens Axboe: "As mentioned in the pull the other day, a few more fixes for this round, all related to the bio op changes in this series. Two fixes, and then a cleanup, renaming bio->bi_rw to bio->bi_opf. I wanted to do that change right after or right before -rc1, so that risk of conflict was reduced. I just rebased the series on top of current master, and no new ->bi_rw usage has snuck in" * 'for-linus' of git://git.kernel.dk/linux-block: block: rename bio bi_rw to bi_opf target: iblock_execute_sync_cache() should use bio_set_op_attrs() mm: make __swap_writepage() use bio_set_op_attrs() block/mm: make bdev_ops->rw_page() take a bool for read/write
This commit is contained in:
commit
857953d72f
62 changed files with 213 additions and 213 deletions
|
|
@ -269,7 +269,7 @@ Arjan's proposed request priority scheme allows higher levels some broad
|
|||
requests which haven't aged too much on the queue. Potentially this priority
|
||||
could even be exposed to applications in some manner, providing higher level
|
||||
tunability. Time based aging avoids starvation of lower priority
|
||||
requests. Some bits in the bi_rw flags field in the bio structure are
|
||||
requests. Some bits in the bi_opf flags field in the bio structure are
|
||||
intended to be used for this priority information.
|
||||
|
||||
|
||||
|
|
@ -432,7 +432,7 @@ struct bio {
|
|||
struct bio *bi_next; /* request queue link */
|
||||
struct block_device *bi_bdev; /* target device */
|
||||
unsigned long bi_flags; /* status, command, etc */
|
||||
unsigned long bi_rw; /* low bits: r/w, high: priority */
|
||||
unsigned long bi_opf; /* low bits: r/w, high: priority */
|
||||
|
||||
unsigned int bi_vcnt; /* how may bio_vec's */
|
||||
struct bvec_iter bi_iter; /* current index into bio_vec array */
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ Optional feature parameters:
|
|||
<direction>: Either 'r' to corrupt reads or 'w' to corrupt writes.
|
||||
'w' is incompatible with drop_writes.
|
||||
<value>: The value (from 0-255) to write.
|
||||
<flags>: Perform the replacement only if bio->bi_rw has all the
|
||||
<flags>: Perform the replacement only if bio->bi_opf has all the
|
||||
selected flags set.
|
||||
|
||||
Examples:
|
||||
|
|
|
|||
Loading…
Reference in a new issue