Re: [patch] scsi: revert "[SCSI] Get rid of scsi_cmnd->done"

Peter Osterlund
2008-01-06T15:02:24Z

On Sun, 6 Jan 2008, James Bottomley wrote:

> On Sat, 2008-01-05 at 19:43 -0800, Linus Torvalds wrote:
>>
>> diff --git a/fs/block_dev.c b/fs/block_dev.c
>> index 993f78c..6a20da9 100644
>> --- a/fs/block_dev.c
>> +++ b/fs/block_dev.c
>> @@ -1191,6 +1191,7 @@ static int do_open(struct block_device *bdev, struct file *file, int for_part)
>> }
>> if (bdev->bd_invalidated)
>> rescan_partitions(bdev->bd_disk, bdev);
>> + bd_inode->i_size = (loff_t)get_capacity(disk)<<9;
>> }
>> }
>> bdev->bd_openers++;
>
> Actually, I think that code is fine ... the block size shouldn't change
> across positive values of bd_openers. I think the true fix is below:
> pktcdvd shouldn't be mucking with the size of the underlying CD/DVD ...
> it can change its own layered device capacity, certainly, but it
> shouldn't be mucking with the capacity that was already set in the
> sr_probe routine. I'm in two minds as to whether the set capacity on
> the underlying device should be removed as well ... I think it should,
> but it is harmless as the sr_probe will also reset it.
>
> However, I'll defer to what Al wants to do.
>
> James
>
> diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
> index 3535ef8..10f3692 100644
> --- a/drivers/block/pktcdvd.c
> +++ b/drivers/block/pktcdvd.c
> @@ -2344,7 +2344,6 @@ static int pkt_open_dev(struct pktcdvd_device *pd, int write)
>
> set_capacity(pd->disk, lba << 2);
> set_capacity(pd->bdev->bd_disk, lba << 2);
> - bd_set_size(pd->bdev, (loff_t)lba << 11);
>
> q = bdev_get_queue(pd->bdev);
> if (write) {

That code was added to fix a similar bug, see:

http://linux.derkeiler.com/Mailing-Lists/Kernel/2004-08/4288.html

Maybe that fix was wrong and should have just set bd_inode->i_size instead
of calling bd_set_size().

--
Peter Osterlund - petero2@telia.com