Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760300AbYAFOvi (ORCPT ); Sun, 6 Jan 2008 09:51:38 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755188AbYAFOnD (ORCPT ); Sun, 6 Jan 2008 09:43:03 -0500 Received: from accolon.hansenpartnership.com ([76.243.235.52]:40698 "EHLO accolon.hansenpartnership.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759372AbYAFOnA (ORCPT ); Sun, 6 Jan 2008 09:43:00 -0500 Subject: Re: [patch] scsi: revert "[SCSI] Get rid of scsi_cmnd->done" From: James Bottomley To: Linus Torvalds Cc: Peter Osterlund , Matthew Wilcox , Ingo Molnar , Linux Kernel Mailing List , Andrew Morton , Jens Axboe , Al Viro In-Reply-To: References: <20080102162534.GA4041@elte.hu> <1199292381.3258.32.camel@localhost.localdomain> <20080102194030.GC11638@parisc-linux.org> <1199304735.3258.53.camel@localhost.localdomain> <1199316785.3258.85.camel@localhost.localdomain> Content-Type: text/plain Date: Sun, 06 Jan 2008 08:42:54 -0600 Message-Id: <1199630574.5205.14.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.12.2 (2.12.2-2.fc8) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1803 Lines: 49 On Sat, 2008-01-05 at 19:43 -0800, Linus Torvalds wrote: > fs/block_dev.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > 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) { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/