Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cdrom: beyond ARRAY_SIZE of viocd_diskinfo
xen/blkfront: fix warning when deleting gendisk on unplug/shutdown
xen/blkfront: allow xenbus state transition to Closing->Closed when not Connected

Linus Torvalds 17 years ago 6c2445ef 929a8651

+7 -5

2 changed files

expand all

drivers

block

xen-blkfront.c

cdrom

viocd.c

+6 -4

drivers/block/xen-blkfront.c

··· 934 934 935 935 spin_lock_irqsave(&blkif_io_lock, flags); 936 936 937 - del_gendisk(info->gd); 938 - 939 937 /* No more blkif_request(). */ 940 938 blk_stop_queue(info->rq); 941 939 ··· 946 948 947 949 blk_cleanup_queue(info->rq); 948 950 info->rq = NULL; 951 + 952 + del_gendisk(info->gd); 949 953 950 954 out: 951 955 xenbus_frontend_closed(dev); ··· 977 977 break; 978 978 979 979 case XenbusStateClosing: 980 - if (info->gd == NULL) 981 - xenbus_dev_fatal(dev, -ENODEV, "gd is NULL"); 980 + if (info->gd == NULL) { 981 + xenbus_frontend_closed(dev); 982 + break; 983 + } 982 984 bd = bdget_disk(info->gd, 0); 983 985 if (bd == NULL) 984 986 xenbus_dev_fatal(dev, -ENODEV, "bdget failed");

+1 -1

drivers/cdrom/viocd.c

··· 587 587 struct device_node *node = vdev->dev.archdata.of_node; 588 588 589 589 deviceno = vdev->unit_address; 590 - if (deviceno > VIOCD_MAX_CD) 590 + if (deviceno >= VIOCD_MAX_CD) 591 591 return -ENODEV; 592 592 if (!node) 593 593 return -ENODEV;