[PATCH] 2.4.20-pre[234] hosed /proc/partitions fix

[Erik Andersen <andersen@codepoet.org>]

On Wed Aug 21, 2002 at 02:45:06PM +0100, Alan Cox wrote:
> On Wed, 2002-08-21 at 04:04, Erik Andersen wrote:
> > On Tue Aug 20, 2002 at 08:27:32PM -0600, Erik wrote:
> > > Try compiling CONFIG_BLK_DEV_LVM into 2.4.20-pre4 and then run
> > > 'cat /proc/partitions' for some amusement. I really like the way
> > 
> > It also seems to occur for md and ataraid.
> 
> Fixed in -ac for a while - not had time to do another sync with Marcelo
> though

Sigh.  I wished I'd known an hour ago, since it would have
saved me the bother of figuring it out myself.

Marcello,
Please apply the following patch to 2.4.20-pre5.  The
patch that went into -pre2 had a nasty bug in it that
causes /proc/partitions to behave very badly.  This
patch restores it to sanity.

 
--- drivers/block/genhd.c.orig	Wed Aug 21 07:51:21 2002
+++ drivers/block/genhd.c	Wed Aug 21 08:03:48 2002
@@ -194,9 +194,7 @@
 
 	/* show the full disk and all non-0 size partitions of it */
 	for (n = 0; n < (gp->nr_real << gp->minor_shift); n++) {
-		int mask = (1<<gp->minor_shift) - 1;
-
-		if (!(n & mask) || gp->part[n].nr_sects) {
+		if (gp->part[n].nr_sects) {
 #ifdef CONFIG_BLK_STATS
 			struct hd_struct *hd = &gp->part[n];
 

 -Erik

--
Erik B. Andersen             http://codepoet-consulting.com/
--This message was written using 73% post-consumer electrons--