block bits for 2.6.30-rc6
Subsystems (3)
Hi,
Three small fixes, that should also got to stable.
git://git.kernel.dk/linux-2.6-block.git for-linus
Ian Campbell (2):
xen/blkfront: allow xenbus state transition to Closing->Closed when not Connected xen/blkfront: fix warning when deleting gendisk on unplug/shutdown
Roel Kluin (1):
cdrom: beyond ARRAY_SIZE of viocd_diskinfo
drivers/block/xen-blkfront.c | 10 ++++++---- drivers/cdrom/viocd.c | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-)
drivers/block/xen-blkfront.c +6 -4
@@ -934,8 +934,6 @@ static void blkfront_closing(struct xenbus_device *dev)spin_lock_irqsave (&blkif_io_lock, flags); -del_gendisk (info->gd); -/* No more blkif_request(). */ blk_stop_queue (info->rq);
@@ -949,6 +947,8 @@ static void blkfront_closing(struct xenbus_device *dev)blk_cleanup_queue (info->rq); info->rq =NULL ; +del_gendisk (info->gd); + out:xenbus_frontend_closed (dev); }
@@ -977,8 +977,10 @@ static void backend_changed(struct xenbus_device *dev,break ;case XenbusStateClosing: -if (info->gd ==NULL ) -xenbus_dev_fatal (dev, -ENODEV ,"gd is NULL" ); +if (info->gd ==NULL ) { +xenbus_frontend_closed (dev); +break ; + } bd =bdget_disk (info->gd,0 );if (bd ==NULL )xenbus_dev_fatal (dev, -ENODEV ,"bdget failed" );
drivers/cdrom/viocd.c +1 -1
@@ -587,7 +587,7 @@ static int viocd_probe(struct vio_dev *vdev, const struct vio_device_id *id)struct device_node *node = vdev->dev.archdata.of_node; deviceno = vdev->unit_address; -if (deviceno >VIOCD_MAX_CD ) +if (deviceno >=VIOCD_MAX_CD )return -ENODEV ;if (!node)return -ENODEV ;
Signature · 1 line
Jens Axboe