lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'upstream-fixes' into upstream

Browse Source 
Conflicts:

	drivers/scsi/sata_sil24.c
This commit is contained in:
Jeff Garzik
2006-06-11 23:04:37 -04:00
parent 1049cb4787 2f9719b61e
commit fec69a9748
201 changed files with 2044 additions and 1108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/scsi_lib.c
View File

@@ -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;