aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Holty <lgeek@frontiernet.net>2006-03-22 06:35:39 -0600
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-06-01 09:16:55 -0500
commitf52359622fa25783cf1a08c0772048d2ed1a7434 (patch)
treeb9b06d8b289d6c9bdb401282497079c4a5b2792c
parent9f434d4f84a235f6b61aec6e691d6b07bc46fc24 (diff)
[SCSI] scsi_lib.c: properly count the number of pages in scsi_req_map_sg()
The calculation of nr_pages in scsi_req_map_sg() doesn't account for the fact that the first page could have an offset that pushes the end of the buffer onto a new page. Signed-off-by: Bryan Holty <lgeek@frontiernet.net> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r--drivers/scsi/scsi_lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 764a8b375ea..faee4757c03 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -367,7 +367,7 @@ static int scsi_req_map_sg(struct request *rq, struct scatterlist *sgl,
int nsegs, unsigned bufflen, gfp_t gfp)
{
struct request_queue *q = rq->q;
- int nr_pages = (bufflen + PAGE_SIZE - 1) >> PAGE_SHIFT;
+ int nr_pages = (bufflen + sgl[0].offset + PAGE_SIZE - 1) >> PAGE_SHIFT;
unsigned int data_len = 0, len, bytes, off;
struct page *page;
struct bio *bio = NULL;