Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S271706AbTHMWJn (ORCPT ); Wed, 13 Aug 2003 18:09:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S271812AbTHMWJn (ORCPT ); Wed, 13 Aug 2003 18:09:43 -0400 Received: from mail.gondor.com ([212.117.64.182]:4109 "EHLO moria.gondor.com") by vger.kernel.org with ESMTP id S271706AbTHMWJm (ORCPT ); Wed, 13 Aug 2003 18:09:42 -0400 Date: Thu, 14 Aug 2003 00:05:32 +0200 From: Jan Niehusmann To: Andries Brouwer Cc: Bartlomiej Zolnierkiewicz , Alan Cox , Linux Kernel Mailing List Subject: Re: IDE bug - was: Re: uncorrectable ext2 errors Message-ID: <20030813220532.GA1799@gondor.com> References: <20030806150335.GA5430@gondor.com> <1060702567.21160.30.camel@dhcp22.swansea.linux.org.uk> <20030813005057.A1863@pclin040.win.tue.nl> <200308130221.26305.bzolnier@elka.pw.edu.pl> <20030813132733.GA6565@win.tue.nl> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20030813132733.GA6565@win.tue.nl> X-Request-PGP: http://gondor.com/key.asc User-Agent: Mutt/1.5.4i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1931 Lines: 54 On Wed, Aug 13, 2003 at 03:27:33PM +0200, Andries Brouwer wrote: > Ah, yes, it was that one. Yes, my patch turned into a mess of rejects > after your layout changes of earlier patches from that series. Here is the most important part (limiting the disk capacity to 137GB if LBA48 is not available) as a patch agains 2.4.21. The goto is not nice, but I didn't want to do a major rewrite. Note that the function contains a bogous if-clause: if (id->cfs_enable_2 & 0x0400) { [...] return; } [...] if ((id->command_set_2 & 0x0400) && (id->cfs_enable_2 & 0x0400)) { [...] The second if-condition can never be true. But I didn't want to touch that stuff. --- linux-2.4.21/drivers/ide/ide-disk.c.orig 2003-08-13 23:14:32.000000000 +0200 +++ linux-2.4.21/drivers/ide/ide-disk.c 2003-08-13 23:14:34.000000000 +0200 @@ -1196,7 +1196,7 @@ drive->bios_cyl = drive->cyl; drive->capacity48 = capacity_2; drive->capacity = (unsigned long) capacity_2; - return; + goto check_capacity48; /* Determine capacity, and use LBA if the drive properly supports it */ } else if ((id->capability & 2) && lba_capacity_is_ok(id)) { capacity = id->lba_capacity; @@ -1228,6 +1228,15 @@ drive->sect = 63; drive->cyl = (unsigned long)(drive->capacity48) / (drive->head * drive->sect); } + +check_capacity48: + /* Limit disk size to 137GB if LBA48 addressing is not supported */ + if (drive->addressing == 0 && drive->capacity48 > (1ULL)<<28) { + printk("%s: cannot use LBA48 - capacity reset " + "from %llu to %llu\n", + drive->name, drive->capacity48, (1ULL)<<28); + drive->capacity48 = (1ULL)<<28; + } } static unsigned long idedisk_capacity (ide_drive_t *drive) - 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/