* Patch for 3 ub bugs in 2.6.9-rc1-mm4
@ 2004-09-12 3:25 Pete Zaitcev
2004-09-14 18:55 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Pete Zaitcev @ 2004-09-12 3:25 UTC (permalink / raw)
To: greg; +Cc: zaitcev, linux-usb-devel, linux-kernel
Hi, Greg,
Actual users of ub quickly found problems, so here's a patch to address
some of them.
#1: An attempt to mount a CF card, pull the plug, then unmount causes a
message "getblk: bad sector size 512" and an oops. This is caused by
trying to do put_disk from disconnect instead of using a reference count.
The sd.c does it this way (it uses kref).
#2: The hald fills /var/log/messages with block device errors. It seems
that it happens because ub allowed opens of known offline devices, and
then partition checking produced those errors. I hope taking code from
sd.c should fix it.
Also I replaced usb_unlink_urb with usb_kill_urb.
-- Pete
diff -urp -X dontdiff linux-2.6.9-rc1-mm4/drivers/block/ub.c linux-2.6.9-rc1-mm4-ub/drivers/block/ub.c
--- linux-2.6.9-rc1-mm4/drivers/block/ub.c 2004-09-09 16:59:26.000000000 -0700
+++ linux-2.6.9-rc1-mm4-ub/drivers/block/ub.c 2004-09-11 20:10:10.760129160 -0700
@@ -490,6 +490,18 @@ static void ub_id_put(int id)
*/
static void ub_cleanup(struct ub_dev *sc)
{
+
+ /*
+ * If we zero disk->private_data BEFORE put_disk, we have to check
+ * for NULL all over the place in open, release, check_media and
+ * revalidate, because the block level semaphore is well inside the
+ * put_disk. But we cannot zero after the call, because *disk is gone.
+ * The sd.c is blatantly racy in this area.
+ */
+ /* disk->private_data = NULL; */
+ put_disk(sc->disk);
+ sc->disk = NULL;
+
ub_id_put(sc->id);
kfree(sc);
}
@@ -1413,7 +1429,15 @@ static int ub_bd_open(struct inode *inod
if (sc->removable || sc->readonly)
check_disk_change(inode->i_bdev);
- /* XXX sd.c and floppy.c bail on open if media is not present. */
+ /*
+ * The sd.c considers ->media_present and ->changed not equivalent,
+ * under some pretty murky conditions (a failure of READ CAPACITY).
+ * We may need it one day.
+ */
+ if (sc->removable && sc->changed && !(filp->f_flags & O_NDELAY)) {
+ rc = -ENOMEDIUM;
+ goto err_open;
+ }
if (sc->readonly && (filp->f_mode & FMODE_WRITE)) {
rc = -EROFS;
@@ -1498,8 +1522,11 @@ static int ub_bd_revalidate(struct gendi
printk(KERN_INFO "%s: device %u capacity nsec %ld bsize %u\n",
sc->name, sc->dev->devnum, sc->capacity.nsec, sc->capacity.bsize);
+ /* XXX Support sector size switching like in sr.c */
+ // blk_queue_hardsect_size(q, sc->capacity.bsize);
set_capacity(disk, sc->capacity.nsec);
// set_disk_ro(sdkp->disk, sc->readonly);
+
return 0;
}
@@ -1746,12 +1773,7 @@ static int ub_probe_clear_stall(struct u
wait_for_completion(&compl);
del_timer_sync(&timer);
- /*
- * Most of the time, URB was done and dev set to NULL, and so
- * the unlink bounces out with ENODEV. We do not call usb_kill_urb
- * because we still think about a backport to 2.4.
- */
- usb_unlink_urb(&sc->work_urb);
+ usb_kill_urb(&sc->work_urb);
/* reset the endpoint toggle */
usb_settoggle(sc->dev, endp, usb_pipeout(sc->last_pipe), 0);
@@ -2011,17 +2033,6 @@ static void ub_disconnect(struct usb_int
blk_cleanup_queue(q);
/*
- * If we zero disk->private_data BEFORE put_disk, we have to check
- * for NULL all over the place in open, release, check_media and
- * revalidate, because the block level semaphore is well inside the
- * put_disk. But we cannot zero after the call, because *disk is gone.
- * The sd.c is blatantly racy in this area.
- */
- /* disk->private_data = NULL; */
- put_disk(disk);
- sc->disk = NULL;
-
- /*
* We really expect blk_cleanup_queue() to wait, so no amount
* of paranoya is too much.
*
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Patch for 3 ub bugs in 2.6.9-rc1-mm4
2004-09-12 3:25 Patch for 3 ub bugs in 2.6.9-rc1-mm4 Pete Zaitcev
@ 2004-09-14 18:55 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2004-09-14 18:55 UTC (permalink / raw)
To: Pete Zaitcev; +Cc: linux-usb-devel, linux-kernel
On Sat, Sep 11, 2004 at 08:25:25PM -0700, Pete Zaitcev wrote:
> Hi, Greg,
>
> Actual users of ub quickly found problems, so here's a patch to address
> some of them.
>
> #1: An attempt to mount a CF card, pull the plug, then unmount causes a
> message "getblk: bad sector size 512" and an oops. This is caused by
> trying to do put_disk from disconnect instead of using a reference count.
> The sd.c does it this way (it uses kref).
>
> #2: The hald fills /var/log/messages with block device errors. It seems
> that it happens because ub allowed opens of known offline devices, and
> then partition checking produced those errors. I hope taking code from
> sd.c should fix it.
>
> Also I replaced usb_unlink_urb with usb_kill_urb.
Applied, thanks.
(oops, you forgot the Signed-off-by: line...)
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-09-14 20:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-09-12 3:25 Patch for 3 ub bugs in 2.6.9-rc1-mm4 Pete Zaitcev
2004-09-14 18:55 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).