Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756597AbYG3Tq0 (ORCPT ); Wed, 30 Jul 2008 15:46:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754617AbYG3TqI (ORCPT ); Wed, 30 Jul 2008 15:46:08 -0400 Received: from fk-out-0910.google.com ([209.85.128.190]:4137 "EHLO fk-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754104AbYG3TqG (ORCPT ); Wed, 30 Jul 2008 15:46:06 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:content-transfer-encoding :content-disposition:message-id; b=My5rzVvlYjUOnBoMNgGPMzzt0/nUMPpyPcfh9e1TflyLrwX3b6r6xlyqA9MwoWf8zU S/J7SPLiR+rQ/L6TVx9vgfcss73MHs6FJLV/PCGMySb4J6sjHl6ZAORsAUe4tb+ly+LN PnmaoTM4UCq3ralg5TPdfD78YuV3Trgc8k6Qo= From: Bartlomiej Zolnierkiewicz To: petkovbb@gmail.com Subject: Re: [PATCH] ide-cd: fix endianity for the error message in cdrom_read_capacity Date: Wed, 30 Jul 2008 21:25:53 +0200 User-Agent: KMail/1.9.9 Cc: "Andrew Morton" , "Greg Kroah-Hartman" , "Petr Tesarik" , linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, "Jens Axboe" , "Jan Kara" References: <1217405406.11834.11.camel@elijah.suse.cz> <20080730011832.0ee55d47.akpm@linux-foundation.org> <9ea470500807300152p5d5414aaq2d0d0053c12ef3f5@mail.gmail.com> In-Reply-To: <9ea470500807300152p5d5414aaq2d0d0053c12ef3f5@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200807302125.54124.bzolnier@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3415 Lines: 92 On Wednesday 30 July 2008, 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. speaking of aesthetics: __u32 -> u32 ;-) > >> 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 applied > > 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. The usual policy is to not apply to -stable patches which are not in Linus' tree so please notify stable@kernelorg team after patch hits mainline. > > > >> > >> ide-cd.c | 18 ++++++++++-------- > >> 1 file changed, 10 insertions(+), 8 deletions(-) > >> > >> diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c > >> --- a/drivers/ide/ide-cd.c > >> +++ b/drivers/ide/ide-cd.c > >> @@ -1305,6 +1305,7 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity, > >> int stat; > >> unsigned char cmd[BLK_MAX_CDB]; > >> unsigned len = sizeof(capbuf); > >> + __u32 blocklen; > >> > >> memset(cmd, 0, BLK_MAX_CDB); > >> cmd[0] = GPCMD_READ_CDVD_CAPACITY; > >> @@ -1317,23 +1318,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; > >> } -- 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/