diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-06 22:40:03 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-06 22:40:03 -0400 |
| commit | f3ffb6814408f29817fc84d40ecc9c796acaa3ab (patch) | |
| tree | b4702cbdbf2c4517a5986bbaa971495b0f92a877 /drivers/scsi/scsi_lib.c | |
| parent | 5bafd76593f060540acbea3b61e3087e009aa269 (diff) | |
| parent | 1def630a6a49dda5bc89dfbd86656293640456f0 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
| -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 764a8b375ead..faee4757c03a 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, | |||
| 367 | int nsegs, unsigned bufflen, gfp_t gfp) | 367 | int nsegs, unsigned bufflen, gfp_t gfp) |
| 368 | { | 368 | { |
| 369 | struct request_queue *q = rq->q; | 369 | struct request_queue *q = rq->q; |
| 370 | int nr_pages = (bufflen + PAGE_SIZE - 1) >> PAGE_SHIFT; | 370 | int nr_pages = (bufflen + sgl[0].offset + PAGE_SIZE - 1) >> PAGE_SHIFT; |
| 371 | unsigned int data_len = 0, len, bytes, off; | 371 | unsigned int data_len = 0, len, bytes, off; |
| 372 | struct page *page; | 372 | struct page *page; |
| 373 | struct bio *bio = NULL; | 373 | struct bio *bio = NULL; |