packet-0.0.2m fails with 2.4.7 kernel
Hello. The patch fails on one hunk ... patching file drivers/block/ll_rw_blk.c Hunk #1 succeeded at 439 (offset 1 line). Hunk #3 succeeded at 483 (offset 1 line). Hunk #5 succeeded at 863 (offset 1 line). Hunk #7 succeeded at 1005 (offset 1 line). Hunk #9 succeeded at 1102 (offset 1 line). Hunk #10 FAILED at 1133. 1 out of 10 hunks FAILED -- saving rejects to file drivers/block/ll_rw_blk.c.rej The .rej file ... *************** *** 1143,1148 **** { if (req->sem != NULL) up(req->sem); blkdev_release_request(req); } --- 1133,1140 ---- { if (req->sem != NULL) up(req->sem); + if (req->end_io) + req->end_io(req); blkdev_release_request(req); } I look forward to the next version. Keep up the good work guys! Regards, Graham
On Sun, Jul 22 2001, Graham Vincent wrote:
Hello.
The patch fails on one hunk ...
the patch needs to be adjusted to the sem -> waiting changes done after pre7. There's a pre-release up here against 2.4.7 that takes care of the merge conflict and the pktcdvd elevator: *.kernel.org/pub/linux/kernel/people/axboe/packet/packet-0.0.2o-pre1.tar.bz2 It's just up, so maybe it's not there the minute you read this mail. -- Jens Axboe
On Son, 22 Jul 2001, Jens Axboe wrote:
*.kernel.org/pub/linux/kernel/people/axboe/packet/packet-0.0.2o-pre1.tar.bz2
OK, I tested it on linux-2.4.7+ext3, works well. ONly thing what I experienced was the following: I had NO disc in the drive when I made pktsetup /dev/pktcdvd /dev/sr0 and then i was NOT able to -d it, to open the drive physically (without paperclip ;-). All calls to pktsetup return invalid i/o something. Rebooting, inserting CD, cdrwtool initializing, then pktsetup and mount and copy worked quite good. Thanks a lot!!! Best wishes Norbert -- ciao norb +-------------------------------------------------------------------+ | Norbert Preining http://www.logic.at/people/preining | | University of Technology Vienna, Austria preining@logic.at | | DSA: 0x09C5B094 (RSA: 0xCF1FA165) mail subject: get [DSA|RSA]-key | +-------------------------------------------------------------------+
On Sun, Jul 22 2001, Norbert Preining wrote:
On Son, 22 Jul 2001, Jens Axboe wrote:
*.kernel.org/pub/linux/kernel/people/axboe/packet/packet-0.0.2o-pre1.tar.bz2
OK, I tested it on linux-2.4.7+ext3, works well.
ONly thing what I experienced was the following: I had NO disc in the drive when I made pktsetup /dev/pktcdvd /dev/sr0 and then i was NOT able to -d it, to open the drive physically (without paperclip ;-). All calls to pktsetup return invalid i/o something.
Sounds like a silly bug -- without diving it, it's probably that you setup the drive (which doesn't require a full open), and when you later want to tear it down you can't because that's not a O_CREAT open and this it fails. The setup should do a full open too most likely, I'll take a look.
Rebooting, inserting CD, cdrwtool initializing, then pktsetup and mount and copy worked quite good.
Excellent -- what drive btw?
Thanks a lot!!!
Aim to please :) -- Jens Axboe
On Mon, 23 Jul 2001, Jens Axboe wrote:
Rebooting, inserting CD, cdrwtool initializing, then pktsetup and mount and copy worked quite good.
Excellent -- what drive btw?
HP CDWriter 9100 IDE Interface. Best wishes Norbert -- ciao norb +-------------------------------------------------------------------+ | Norbert Preining http://www.logic.at/people/preining | | University of Technology Vienna, Austria preining@logic.at | | DSA: 0x09C5B094 (RSA: 0xCF1FA165) mail subject: get [DSA|RSA]-key | +-------------------------------------------------------------------+
On Mon, 23 Jul 2001, Jens Axboe wrote:
ONly thing what I experienced was the following: I had NO disc in the drive when I made pktsetup /dev/pktcdvd /dev/sr0 and then i was NOT able to -d it, to open the drive physically (without paperclip ;-). All calls to pktsetup return invalid i/o something.
Sounds like a silly bug -- without diving it, it's probably that you setup the drive (which doesn't require a full open), and when you later want to tear it down you can't because that's not a O_CREAT open and this it fails. The setup should do a full open too most likely, I'll take a look.
Is this patch an acceptable fix? (The pkt_new_dev function is modified to make sure there is a readable disk in the drive.) --- linux/drivers/block/pktcdvd.c.orig Mon Aug 20 00:40:18 2001 +++ linux/drivers/block/pktcdvd.c Mon Aug 20 00:18:30 2001 @@ -2160,6 +2160,15 @@ return -ENXIO; } + { + int ret; + long lba; + if ((ret = cdrom_get_last_written(dev, &lba))) { + printk("pktcdvd: cdrom_get_last_written failed\n"); + return ret; + } + } + MOD_INC_USE_COUNT; memset(pd, 0, sizeof(struct pktcdvd_device)); -- Peter Österlund peter.osterlund@mailbox.swipnet.se Sköndalsvägen 35 http://home1.swipnet.se/~w-15919 S-128 66 Sköndal +46 8 942647 Sweden
participants (4)
-
Graham Vincent -
Jens Axboe -
Norbert Preining -
Peter Osterlund