Re: 2.5.1-pre2 compile error in ide-scsi.o ide-scsi.c

Sebastian Dröge
2001-11-27T20:48:38Z

[-- Attachment #1: Type: text/plain, Size: 532 bytes --]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

ok
I've corrected it myself I think
The patch is attached
Hopefully it doesn't break something :)
It's my first patch so please don't kill me
Bye

PS: sorry if/when you get this mail twice :(
My mail client is a bit confused today

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE8A/xbvIHrJes3kVIRAoyxAJ4+XrCYXffS3P8zCmttT5WvkJ6w1QCdGpxK
nMof4o/n2VictCFrvZGRXeA=
=04xe
-----END PGP SIGNATURE-----

[-- Attachment #2: patch --]
[-- Type: text/x-diff, Size: 1292 bytes --]

--- linux/drivers/scsi/ide-scsi.c Tue Nov 27 21:41:35 2001
+++ linux/drivers/scsi/ide-scsi.c.old Tue Nov 27 21:40:38 2001
@@ -707,9 +707,9 @@
printk ("ide-scsi: %s: building DMA table, %d segments, %dkB total\n", drive->name, segments, pc->request_transfer >> 10);
#endif /* IDESCSI_DEBUG_LOG */
while (segments--) {
- bh->bi_io_vec->bvl_vec->bv_page = sg->page;
- bh->bi_io_vec->bvl_vec->bv_len = sg->length;
- bh->bi_io_vec->bvl_vec->bv_offset = sg->offset;
+ bh->bi_io_vec.bv_page = sg->page;
+ bh->bi_io_vec.bv_len = sg->length;
+ bh->bi_io_vec.bv_offset = sg->offset;
bh = bh->bi_next;
sg++;
}
@@ -719,9 +719,9 @@
#if IDESCSI_DEBUG_LOG
printk ("ide-scsi: %s: building DMA table for a single buffer (%dkB)\n", drive->name, pc->request_transfer >> 10);
#endif /* IDESCSI_DEBUG_LOG */
- bh->bi_io_vec->bvl_vec->bv_page = virt_to_page(pc->scsi_cmd->request_buffer);
- bh->bi_io_vec->bvl_vec->bv_len = pc->request_transfer;
- bh->bi_io_vec->bvl_vec->bv_offset = (unsigned long) pc->scsi_cmd->request_buffer & ~PAGE_MASK;
+ bh->bi_io_vec.bv_page = virt_to_page(pc->scsi_cmd->request_buffer);
+ bh->bi_io_vec.bv_len = pc->request_transfer;
+ bh->bi_io_vec.bv_offset = (unsigned long) pc->scsi_cmd->request_buffer & ~PAGE_MASK;
}
return first_bh;
}