On 06/05/2016 09:31 PM, mchristi@xxxxxxxxxx wrote:
> From: Mike Christie <mchristi@xxxxxxxxxx>
>
> This patch converts the simple bi_rw use cases in the block,
> drivers, mm and fs code to set/get the bio operation using
> bio_set_op_attrs/bio_op
>
> These should be simple one or two liner cases, so I just did them
> in one patch. The next patches handle the more complicated
> cases in a module per patch.
>
> Signed-off-by: Mike Christie <mchristi@xxxxxxxxxx>
> ---
>
> v5:
> 1. Add missed crypto call.
> 2. Change nfs bi_rw check to bi_op.
>
> block/bio.c | 13 ++++++-------
> block/blk-core.c | 6 +++---
> block/blk-flush.c | 2 +-
> block/blk-lib.c | 4 ++--
> block/blk-map.c | 2 +-
> block/blk-merge.c | 12 ++++++------
> drivers/block/brd.c | 2 +-
> drivers/block/floppy.c | 2 +-
> drivers/block/pktcdvd.c | 4 ++--
> drivers/block/rsxx/dma.c | 2 +-
> drivers/block/zram/zram_drv.c | 2 +-
> drivers/lightnvm/rrpc.c | 6 +++---
> drivers/scsi/osd/osd_initiator.c | 8 ++++----
> drivers/staging/lustre/lustre/llite/lloop.c | 6 +++---
> fs/crypto/crypto.c | 2 +-
> fs/exofs/ore.c | 2 +-
> fs/ext4/page-io.c | 6 +++---
> fs/ext4/readpage.c | 2 +-
> fs/jfs/jfs_logmgr.c | 4 ++--
> fs/jfs/jfs_metapage.c | 4 ++--
> fs/logfs/dev_bdev.c | 12 ++++++------
> fs/nfs/blocklayout/blocklayout.c | 4 ++--
> include/linux/bio.h | 15 ++++++++++-----
> mm/page_io.c | 4 ++--
> 24 files changed, 65 insertions(+), 61 deletions(-)
>
[ .. ]
> diff --git a/include/linux/bio.h b/include/linux/bio.h
> index 09c5308..4568647 100644
> --- a/include/linux/bio.h
> +++ b/include/linux/bio.h
> @@ -109,18 +109,23 @@ static inline bool bio_has_data(struct bio *bio)
> {
> if (bio &&
> bio->bi_iter.bi_size &&
> - !(bio->bi_rw & REQ_DISCARD))
> + bio_op(bio) != REQ_OP_DISCARD)
> return true;
>
> return false;
> }
>
> +static inline bool bio_no_advance_iter(struct bio *bio)
> +{
> + return bio_op(bio) == REQ_OP_DISCARD || bio_op(bio) == REQ_OP_WRITE_SAME;
> +}
> +
> static inline bool bio_is_rw(struct bio *bio)
> {
> if (!bio_has_data(bio))
> return false;
>
> - if (bio->bi_rw & BIO_NO_ADVANCE_ITER_MASK)
> + if (bio_no_advance_iter(bio))
> return false;
>
> return true;
> @@ -228,7 +233,7 @@ static inline void bio_advance_iter(struct bio *bio, struct bvec_iter *iter,
> {
> iter->bi_sector += bytes >> 9;
>
> - if (bio->bi_rw & BIO_NO_ADVANCE_ITER_MASK)
> + if (bio_no_advance_iter(bio))
> iter->bi_size -= bytes;
> else
> bvec_iter_advance(bio->bi_io_vec, iter, bytes);
Hmm. Can't you drop 'BIO_NO_ADVANCE_ITER_MASK' after this patch?
> @@ -256,10 +261,10 @@ static inline unsigned bio_segments(struct bio *bio)
> * differently:
> */
>
> - if (bio->bi_rw & REQ_DISCARD)
> + if (bio_op(bio) == REQ_OP_DISCARD)
> return 1;
>
> - if (bio->bi_rw & REQ_WRITE_SAME)
> + if (bio_op(bio) == REQ_OP_WRITE_SAME)
> return 1;
>
> bio_for_each_segment(bv, bio, iter)
> diff --git a/mm/page_io.c b/mm/page_io.c
> index 5a5fd66..dcc5d37 100644
> --- a/mm/page_io.c
> +++ b/mm/page_io.c
> @@ -317,7 +317,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc,
> ret = -ENOMEM;
> goto out;
> }
> - bio->bi_rw = WRITE;
> + bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
> if (wbc->sync_mode == WB_SYNC_ALL)
> bio->bi_rw |= REQ_SYNC;
> count_vm_event(PSWPOUT);
> @@ -370,7 +370,7 @@ int swap_readpage(struct page *page)
> ret = -ENOMEM;
> goto out;
> }
> - bio->bi_rw = READ;
> + bio_set_op_attrs(bio, REQ_OP_READ, 0);
> count_vm_event(PSWPIN);
> submit_bio(bio);
> out:
>
Reviewed-by: Hannes Reinecke <hare@xxxxxxxx>
Cheers,
Hannes
--
Dr. Hannes Reinecke Teamlead Storage & Networking
hare@xxxxxxx +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-block" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
