RE: [PATCH v4 08/24] block: Remove some unnecessary bi_vcnt usage

From: Reddy, Sreekanth <hidden>
Date: 2012-11-07 06:06:01
Also in: dm-devel, linux-scsi, lkml
Reply to: Kent Overstreet, 2012-10-15

Hi,

This patch seem to be fine. Please consider this patch as Acked-by: "Sreekanth Reddy" [off-list ref]

Regards,
Sreekanth.

-----Original Message-----
From: <redacted> [mailto:<redacted>] On Behalf Of Kent Overstreet
Sent: Tuesday, October 16, 2012 1:39 AM
To: <redacted>; <redacted>; <redacted>
Cc: Kent Overstreet; <redacted>; <redacted>; <redacted>; <redacted>; Moore, Eric; James E.J. Bottomley; <redacted>
Subject: [PATCH v4 08/24] block: Remove some unnecessary bi_vcnt usage

More prep work for immutable bvecs/effecient bio splitting - usage of bi_vcnt has to be auditing, so getting rid of all the unnecessary usage makes that easier.

Plus, bio_segments() is really what this code wanted, as it respects the current value of bi_idx.

Signed-off-by: Kent Overstreet <redacted>
CC: Jens Axboe <redacted>
CC: Eric Moore <redacted>
CC: "James E.J. Bottomley" <redacted>
CC: <redacted>
---
 drivers/message/fusion/mptsas.c          |  6 +++---
 drivers/scsi/libsas/sas_expander.c       |  6 +++---
 drivers/scsi/mpt2sas/mpt2sas_transport.c | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c index 551262e..5406a9f 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c

@@ -2235,10 +2235,10 @@ static int mptsas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
 	}
 
 	/* do we need to support multiple segments? */
-	if (req->bio->bi_vcnt > 1 || rsp->bio->bi_vcnt > 1) {
+	if (bio_segments(req->bio) > 1 || bio_segments(rsp->bio) > 1) {
 		printk(MYIOC_s_ERR_FMT "%s: multiple segments req %u %u, rsp %u %u\n",
-		    ioc->name, __func__, req->bio->bi_vcnt, blk_rq_bytes(req),
-		    rsp->bio->bi_vcnt, blk_rq_bytes(rsp));
+		    ioc->name, __func__, bio_segments(req->bio), blk_rq_bytes(req),
+		    bio_segments(rsp->bio), blk_rq_bytes(rsp));
 		return -EINVAL;
 	}

diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index efc6e72..ee331a7 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c

@@ -2151,10 +2151,10 @@ int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
 	}
 
 	/* do we need to support multiple segments? */
-	if (req->bio->bi_vcnt > 1 || rsp->bio->bi_vcnt > 1) {
+	if (bio_segments(req->bio) > 1 || bio_segments(rsp->bio) > 1) {
 		printk("%s: multiple segments req %u %u, rsp %u %u\n",
-		       __func__, req->bio->bi_vcnt, blk_rq_bytes(req),
-		       rsp->bio->bi_vcnt, blk_rq_bytes(rsp));
+		       __func__, bio_segments(req->bio), blk_rq_bytes(req),
+		       bio_segments(rsp->bio), blk_rq_bytes(rsp));
 		return -EINVAL;
 	}

diff --git a/drivers/scsi/mpt2sas/mpt2sas_transport.c b/drivers/scsi/mpt2sas/mpt2sas_transport.c
index c6cf20f..403a57b 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_transport.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_transport.c

@@ -1939,7 +1939,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
 	ioc->transport_cmds.status = MPT2_CMD_PENDING;
 
 	/* Check if the request is split across multiple segments */
-	if (req->bio->bi_vcnt > 1) {
+	if (bio_segments(req->bio) > 1) {
 		u32 offset = 0;
 
 		/* Allocate memory and copy the request */ @@ -1971,7 +1971,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
 
 	/* Check if the response needs to be populated across
 	 * multiple segments */
-	if (rsp->bio->bi_vcnt > 1) {
+	if (bio_segments(rsp->bio) > 1) {
 		pci_addr_in = pci_alloc_consistent(ioc->pdev, blk_rq_bytes(rsp),
 		    &pci_dma_in);
 		if (!pci_addr_in) {

@@ -2038,7 +2038,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
 	sgl_flags = (MPI2_SGE_FLAGS_SIMPLE_ELEMENT |
 	    MPI2_SGE_FLAGS_END_OF_BUFFER | MPI2_SGE_FLAGS_HOST_TO_IOC);
 	sgl_flags = sgl_flags << MPI2_SGE_FLAGS_SHIFT;
-	if (req->bio->bi_vcnt > 1) {
+	if (bio_segments(req->bio) > 1) {
 		ioc->base_add_sg_single(psge, sgl_flags |
 		    (blk_rq_bytes(req) - 4), pci_dma_out);
 	} else {

@@ -2054,7 +2054,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
 	    MPI2_SGE_FLAGS_LAST_ELEMENT | MPI2_SGE_FLAGS_END_OF_BUFFER |
 	    MPI2_SGE_FLAGS_END_OF_LIST);
 	sgl_flags = sgl_flags << MPI2_SGE_FLAGS_SHIFT;
-	if (rsp->bio->bi_vcnt > 1) {
+	if (bio_segments(rsp->bio) > 1) {
 		ioc->base_add_sg_single(psge, sgl_flags |
 		    (blk_rq_bytes(rsp) + 4), pci_dma_in);
 	} else {

@@ -2099,7 +2099,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
 		    le16_to_cpu(mpi_reply->ResponseDataLength);
 		/* check if the resp needs to be copied from the allocated
 		 * pci mem */
-		if (rsp->bio->bi_vcnt > 1) {
+		if (bio_segments(rsp->bio) > 1) {
 			u32 offset = 0;
 			u32 bytes_to_copy =
 			    le16_to_cpu(mpi_reply->ResponseDataLength);
--

1.7.12

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at  http://vger.kernel.org/majordomo-info.html

Kent Overstreet · 2012-10-15
[PATCH v4 02/24] block: Refactor blk_update_request() · Kent Overstreet · 2012-10-15
[PATCH v4 01/24] block: Add bio_advance() · Kent Overstreet · 2012-10-15
[PATCH v4 07/24] block: Remove bi_idx references · Kent Overstreet · 2012-10-15
[PATCH v4 10/24] raid10: Use bio_reset() · Kent Overstreet · 2012-10-15
[PATCH v4 12/24] raid5: use bio_reset() · Kent Overstreet · 2012-10-15
[PATCH v4 15/24] pktcdvd: use bio_copy_data() · Kent Overstreet · 2012-10-15
[PATCH v4 20/24] block: Convert some code to bio_for_each_segment_all() · Kent Overstreet · 2012-10-15
[PATCH v4 21/24] block: Add bio_alloc_pages() · Kent Overstreet · 2012-10-15
[PATCH v4 1/2] block: Reorder struct bio_set · Kent Overstreet · 2012-10-15
Re: [PATCH v4 1/2] block: Reorder struct bio_set · Tejun Heo · 2012-10-19
[PATCH v4 2/2] block: Convert integrity to bvec_alloc_bs() · Kent Overstreet · 2012-10-15
Re: [PATCH v4 2/2] block: Convert integrity to bvec_alloc_bs() · Vivek Goyal · 2012-10-19
[PATCH v2 04/26] md: Convert md_trim_bio() to use bio_advance() · Kent Overstreet · 2012-10-15
[PATCH v2 10/26] block: Add submit_bio_wait(), remove from md · Kent Overstreet · 2012-10-15
[PATCH v2 09/26] block: Remove some unnecessary bi_vcnt usage · Kent Overstreet · 2012-10-15
[PATCH v2 08/26] block: Remove bi_idx references · Kent Overstreet · 2012-10-15
[PATCH v2 15/26] block: Add bio_copy_data() · Kent Overstreet · 2012-10-15
[PATCH v2 20/26] block: Add bio_for_each_segment_all() · Kent Overstreet · 2012-10-15
[PATCH v2 19/26] bounce: Refactor __blk_queue_bounce to not use bi_io_vec · Kent Overstreet · 2012-10-15
[PATCH v2 25/26] bio-integrity: Add explicit field for owner of bip_buf · Kent Overstreet · 2012-10-15
[PATCH v2 24/26] block: Add an explicit bio flag for bios that own their bvec · Kent Overstreet · 2012-10-15
[PATCH v2 26/26] block: Add BIO_SUBMITTED flag, kill BIO_CLONED · Kent Overstreet · 2012-10-15
[PATCH v2 23/26] raid1: use bio_alloc_pages() · Kent Overstreet · 2012-10-15
[PATCH v2 22/26] block: Add bio_alloc_pages() · Kent Overstreet · 2012-10-15
[PATCH v2 21/26] block: Convert some code to bio_for_each_segment_all() · Kent Overstreet · 2012-10-15
[PATCH v2 18/26] raid1: use bio_copy_data() · Kent Overstreet · 2012-10-15
[PATCH v2 17/26] pktcdvd: Use bio_reset() in disabled code to kill bi_idx usage · Kent Overstreet · 2012-10-15
[PATCH v2 16/26] pktcdvd: use bio_copy_data() · Kent Overstreet · 2012-10-15
[PATCH v2 14/26] raid1: Refactor narrow_write_error() to not use bi_idx · Kent Overstreet · 2012-10-15
[PATCH v2 13/26] raid5: use bio_reset() · Kent Overstreet · 2012-10-15
[PATCH v2 12/26] raid1: use bio_reset() · Kent Overstreet · 2012-10-15
[PATCH v2 11/26] raid10: Use bio_reset() · Kent Overstreet · 2012-10-15
[PATCH v2 07/26] block: Don't use bi_idx in bio_split() or require it to be 0 · Kent Overstreet · 2012-10-15
[PATCH v2 06/26] block: Use bio_sectors() more consistently · Kent Overstreet · 2012-10-15
[PATCH v2 05/26] block: Add bio_end() · Kent Overstreet · 2012-10-15
[PATCH v2 03/26] block: Refactor blk_update_request() · Kent Overstreet · 2012-10-15
[PATCH v2 02/26] block: Add bio_advance() · Kent Overstreet · 2012-10-15
[PATCH v2 01/26] block: Convert integrity to bvec_alloc_bs(), and a bugfix · Kent Overstreet · 2012-10-15
Re: [PATCH v2 01/26] block: Convert integrity to bvec_alloc_bs(), and a bugfix · Tejun Heo · 2012-10-19
Re: [PATCH v2 01/26] block: Convert integrity to bvec_alloc_bs(), and a bugfix · Tejun Heo · 2012-10-19
[PATCH v2 00/26] Prep work for immutable bio vecs · Kent Overstreet · 2012-10-15
[PATCH v4 1/2] block: Fix a buffer overrun in bio_integrity_split() · Kent Overstreet · 2012-10-15
Re: [PATCH v4 1/2] block: Fix a buffer overrun in bio_integrity_split() · Tejun Heo · 2012-10-19
Re: [PATCH v4 1/2] block: Fix a buffer overrun in bio_integrity_split() · Vivek Goyal · 2012-10-22
[PATCH v4 2/2] block: Avoid deadlocks with bio allocation by stacking drivers · Kent Overstreet · 2012-10-15
[PATCH v4 24/24] block: Add BIO_SUBMITTED flag, kill BIO_CLONED · Kent Overstreet · 2012-10-15
[PATCH v4 23/24] bio-integrity: Add explicit field for owner of bip_buf · Kent Overstreet · 2012-10-15
[PATCH v4 22/24] block: Add an explicit bio flag for bios that own their bvec · Kent Overstreet · 2012-10-15
[PATCH v4 19/24] block: Add bio_for_each_segment_all() · Kent Overstreet · 2012-10-15
[PATCH v4 18/24] bounce: Refactor __blk_queue_bounce to not use bi_io_vec · Kent Overstreet · 2012-10-15
[PATCH v4 17/24] raid1: use bio_copy_data() · Kent Overstreet · 2012-10-15
[PATCH v4 16/24] pktcdvd: Use bio_reset() in disabled code to kill bi_idx usage · Kent Overstreet · 2012-10-15
[PATCH v4 14/24] block: Add bio_copy_data() · Kent Overstreet · 2012-10-15
[PATCH v4 13/24] raid1: Refactor narrow_write_error() to not use bi_idx · Kent Overstreet · 2012-10-15
[PATCH v4 11/24] raid1: use bio_reset() · Kent Overstreet · 2012-10-15
[PATCH v4 09/24] block: Add submit_bio_wait(), remove from md · Kent Overstreet · 2012-10-15
[PATCH v4 08/24] block: Remove some unnecessary bi_vcnt usage · Kent Overstreet · 2012-10-15
RE: [PATCH v4 08/24] block: Remove some unnecessary bi_vcnt usage · Reddy, Sreekanth · 2012-11-06
RE: [PATCH v4 08/24] block: Remove some unnecessary bi_vcnt usage · Reddy, Sreekanth · 2012-11-07
[PATCH v4 06/24] block: Change bio_split() to respect the current value of bi_idx · Kent Overstreet · 2012-10-15
[PATCH v4 05/24] block: Use bio_sectors() more consistently · Kent Overstreet · 2012-10-15
Re: [PATCH v4 05/24] block: Use bio_sectors() more consistently · Ed Cashin · 2012-10-16
[PATCH v4 04/24] block: Add bio_end_sector() · Kent Overstreet · 2012-10-15
[PATCH v4 03/24] md: Convert md_trim_bio() to use bio_advance() · Kent Overstreet · 2012-10-15
Tejun Heo · 2012-10-19
Mike Snitzer · 2012-10-19
View all 67 messages

`h`	back out one level
`j`	next message in thread / next series-diff position
`k`	previous message in thread / previous series-diff position
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help