Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753263AbYG3TNF (ORCPT ); Wed, 30 Jul 2008 15:13:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752084AbYG3TMw (ORCPT ); Wed, 30 Jul 2008 15:12:52 -0400 Received: from fg-out-1718.google.com ([72.14.220.154]:24138 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751974AbYG3TMv (ORCPT ); Wed, 30 Jul 2008 15:12:51 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=date:to:cc:subject:message-id:reply-to:mail-followup-to:references :mime-version:content-type:content-disposition :content-transfer-encoding:in-reply-to:user-agent:from; b=oYTB0aQPeaHtTKqxhtvFs2y0+0oiYTDr2nOKMKq87XmAbcrZKQJPfg5ZoUej3VAuAz HdRl4YSDOdGW079szABIgzCUA2lqiYT+/WnboYIkNG+j9xVx/JWf6fCHwcBnhmAtrbkB ikmr1lLA/Yl0ggEsfblZ88KQ/wmUmT+FQ3FKs= Date: Wed, 30 Jul 2008 21:12:57 +0200 To: Greg KH Cc: stable@kernel.org, Andrew Morton , Petr Tesarik , linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, Jens Axboe , Jan Kara , Bartlomiej Zolnierkiewicz Subject: Re: [PATCH] ide-cd: fix endianity for the error message in cdrom_read_capacity Message-ID: <20080730191257.GA1205@gollum.tnic> Reply-To: petkovbb@gmail.com Mail-Followup-To: petkovbb@gmail.com, Greg KH , stable@kernel.org, Andrew Morton , Petr Tesarik , linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, Jens Axboe , Jan Kara , Bartlomiej Zolnierkiewicz References: <1217405406.11834.11.camel@elijah.suse.cz> <20080730011832.0ee55d47.akpm@linux-foundation.org> <9ea470500807300152p5d5414aaq2d0d0053c12ef3f5@mail.gmail.com> <20080730163327.GA23086@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20080730163327.GA23086@suse.de> User-Agent: Mutt/1.5.17+20080114 (2008-01-14) From: Borislav Petkov Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3603 Lines: 110 On Wed, Jul 30, 2008 at 09:33:28AM -0700, Greg KH wrote: > On Wed, Jul 30, 2008 at 10:52:50AM +0200, Boris Petkov wrote: > > On Wed, Jul 30, 2008 at 10:18 AM, Andrew Morton > > wrote: > > > On Wed, 30 Jul 2008 10:10:06 +0200 Petr Tesarik wrote: > > > > > >> Resent because of a typo in the LKML address. :( > > > > > > Thanks. > > > > > >> > > >> Aesthetic regards aside, commit e8e7b9eb11c34ee18bde8b7011af41938d1ad667 > > >> still leaves a bug in the error message, because it uses the unconverted > > >> big-endian value for printk. > > >> > > >> Fix this by using a local variable in machine byte order. The result is > > >> correct, more readable, and also produces slightly shorter code on i386. > > >> > > >> Cc: Jens Axboe > > >> Cc: Jan Kara > > >> Signed-off-by: Petr Tesarik > > > > I definitely like this one better, thanks. > > > > Acked-by: Borislav Petkov > > > > > > > > > > Bart owns this patch now. It got lost for a month and it has already > > > been fixed twice and it is also on the route to 2.6.25.x and 2.6.26.x, > > > so it'll get complicated. Not a happy little patch. > > > > Greg, can you please apply this one on top of -stable. > > What one? Do you have a git commit id? Oh, sorry about that. Ok, you should have in both 2.6.25 and .26 the patch with upstream commit id e8e7b9eb11c34ee18bde8b7011af41938d1ad667. I rediffed the new one on top, here's the 2.6.26 version, the 2.6.25 one follows. -- From: Petr Tesarik Aesthetic regards aside, commit e8e7b9eb11c34ee18bde8b7011af41938d1ad667 still leaves a bug in the error message, because it uses the unconverted big-endian value for printk. Fix this by using a local variable in machine byte order. The result is correct, more readable, and also produces slightly shorter code on i386. Cc: Jens Axboe Cc: Jan Kara Signed-off-by: Petr Tesarik Acked-by: Borislav Petkov --- diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 0cc854e..59875bb 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c @@ -1298,6 +1298,7 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity, int stat; struct request req; + __u32 blocklen; ide_cd_init_rq(drive, &req); @@ -1314,23 +1315,24 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity, /* * Sanity check the given block size */ - switch (capbuf.blocklen) { - case __constant_cpu_to_be32(512): - case __constant_cpu_to_be32(1024): - case __constant_cpu_to_be32(2048): - case __constant_cpu_to_be32(4096): + blocklen = be32_to_cpu(capbuf.blocklen); + switch (blocklen) { + case 512: + case 1024: + case 2048: + case 4096: break; default: printk(KERN_ERR "%s: weird block size %u\n", - drive->name, capbuf.blocklen); + drive->name, blocklen); printk(KERN_ERR "%s: default to 2kb block size\n", drive->name); - capbuf.blocklen = __constant_cpu_to_be32(2048); + blocklen = 2048; break; } *capacity = 1 + be32_to_cpu(capbuf.lba); - *sectors_per_frame = be32_to_cpu(capbuf.blocklen) >> SECTOR_BITS; + *sectors_per_frame = blocklen >> SECTOR_BITS; return 0; } -- Regards/Gru?, Boris. -- 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/