diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-08 00:03:28 -0400 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2006-06-22 12:16:12 -0700 |
| commit | a4dad8b5746aa25f97c5b94c96fcf20cda9593fb (patch) | |
| tree | b02b233fc073808d906a78e13b2f6c7186900657 | |
| parent | b558f9f2cd432f2c8797098f239dad284aba1334 (diff) | |
| download | kernel-common-a4dad8b5746aa25f97c5b94c96fcf20cda9593fb.tar.gz kernel-common-a4dad8b5746aa25f97c5b94c96fcf20cda9593fb.tar.bz2 kernel-common-a4dad8b5746aa25f97c5b94c96fcf20cda9593fb.zip | |
[PATCH] 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>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 701a328f7beb..a0cd6de91afe 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -368,7 +368,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; |