PATCH: linux-2.5.1-pre7/drivers/block/xd.c compilation fix (version 2)
Per the advice of Jens Axboe, I have added one line to my
previous fix to make linux-2.5.1-pre7/drivers/block/xd.c compile (the "&& (CURRENT->flags & REQ_CMD)" line). Here is the diff against pristine linux-2.5.1-pre7/drivers/block/xd.c.
There is no maintainer for xd.c listed in linux/MAINTAINERS,
although I am and have been mailing to the email addresses that appear in xd.c.
Linus, if nobody says otherwise, I recommend that you apply
this patch.
Signature · 4 lines
Adam J. Richter __ ______________ 4880 Stevens Creek Blvd, Suite 104 [email protected] \ / San Jose, California 95129-1034 +1 408 261-6630 | g g d r a s i l United States of America fax +1 408 261-6631 "Free Software For The Rest Of Us."
drivers/block/xd.c +4 -5
@@ -121,7 +121,6 @@static struct hd_struct xd_struct[XD_MAXDRIVES <<6 ];static int xd_sizes[XD_MAXDRIVES <<6 ], xd_access[XD_MAXDRIVES ];static int xd_blocksizes[XD_MAXDRIVES <<6 ]; -static int xd_maxsect[XD_MAXDRIVES <<6 ];extern struct block_device_operations xd_fops;
@@ -246,8 +245,7 @@ }/* xd_maxsectors depends on controller - so set after detection */ -for (i=0 ; i<(XD_MAXDRIVES <<6 ); i++) xd_maxsect[i] = xd_maxsectors; - max_sectors[MAJOR_NR ] = xd_maxsect; +blk_queue_max_sectors (BLK_DEFAULT_QUEUE (MAJOR_NR ), xd_maxsectors);for (i =0 ; i < xd_drives; i++) { xd_valid[i] =1 ;
@@ -289,16 +287,17 @@INIT_REQUEST ;/* do some checking on the request structure */ if (CURRENT_DEV < xd_drives + && (CURRENT ->flags &REQ_CMD ) &&CURRENT ->sector +CURRENT ->nr_sectors <= xd_struct[MINOR (CURRENT ->rq_dev)].nr_sects) { block =CURRENT ->sector; count =CURRENT ->nr_sectors; -switch (CURRENT ->cmd) { +switch (rq_data_dir (CURRENT )) {case READ :case WRITE :for (retry =0 ; (retry <XD_RETRIES ) && !code; retry++) - code =xd_readwrite (CURRENT ->cmd,CURRENT_DEV ,CURRENT ->buffer,block,count); + code =xd_readwrite (rq_data_dir (CURRENT ),CURRENT_DEV ,CURRENT ->buffer,block,count);break ;default :printk ("do_xd_request: unknown request\n" );
Quoted 3 lines · Adam J. Richter
Linus, if nobody says otherwise, I recommend that you apply
this patch.
Well, I already applied your previous one, in fact, and it's in the just-uploaded pre8 kernel. Mind verifying that and sending the incremental update?
Btw, do you actually _have_ a machine that uses the xd driver, or was this patch done just out of some perverse joy in theoretical retrocomputing?
Linus
Quoted 7 lines · Linus Torvalds
Quoted 3 lines · Adam J. Richter
Linus, if nobody says otherwise, I recommend that you apply
this patch.Btw, do you actually _have_ a machine that uses the xd driver, or was this patch done just out of some perverse joy in theoretical retrocomputing?
I have somewhere a machine that used to work with such hardware, but have never tested it with anything newer than 2.2.x kernel and have no time to perform such tests in the near future (Maybe I'll find some after Christmas).
AFAIR the hardware works fine with 386/486 with clock up to 66 MHz. Faster machines have problems with BIOS initialization, probably due to very slow EPROM chips or badly designed timing calculations in their BIOSes. They *might* work with BIOS disabled/romoved, but all hardware I have has the BIOS chips integrated.
Most hardwate supports drives up to 40 MB (I have only 20s) and the transfer rates about 20-40 kB/s. Faster (with memory mapped I/O) boards are not supported by the driver.
Signature · 4 lines
======================================================================= Andrzej M. Krzysztofowicz [email protected] tel. (0-58) 347 14 61 Wydz.Fizyki Technicznej i Matematyki Stosowanej Politechniki Gdanskiej