patch-1.3.31 linux/drivers/block/genhd.c

• Lines: 53
• Date: Fri Sep 29 09:27:39 1995
• Orig file: v1.3.30/linux/drivers/block/genhd.c
• Orig date: Mon Sep 25 12:26:21 1995

diff -u --recursive --new-file v1.3.30/linux/drivers/block/genhd.c linux/drivers/block/genhd.c
@@ -88,7 +88,7 @@
 	this_sector = first_sector;
 
 	while (1) {
-		if ((current_minor & mask) >= hd->max_p)
+		if ((current_minor & mask) == 0)
 			return;
 		if (!(bh = bread(dev,0,1024)))
 			return;
@@ -134,7 +134,7 @@
 
 		    add_partition(hd, current_minor, this_sector+p->start_sect, p->nr_sects);
 		    current_minor++;
-		    if ((current_minor & mask) >= hd->max_p)
+		    if ((current_minor & mask) == 0)
 		      goto done;
 		}
 		/*
@@ -254,8 +254,6 @@
 		if (!p->nr_sects)
 			continue;
 		add_partition(hd, minor, first_sector+p->start_sect, p->nr_sects);
-		if ((current_minor & 0x3f) >= 60)
-			continue;
 		if (p->sys_ind == EXTENDED_PARTITION) {
 			printk(" <");
 			/*
@@ -280,7 +278,7 @@
 		p = (struct partition *) (0x1be + data);
 		for (i = 4 ; i < 16 ; i++, current_minor++) {
 			p--;
-			if ((current_minor & mask) >= mask-2)
+			if ((current_minor & mask) == 0)
 				break;
 			if (!(p->start_sect && p->nr_sects))
 				continue;
@@ -299,6 +297,7 @@
 static int osf_partition(struct gendisk *hd, unsigned int dev, unsigned long first_sector)
 {
 	int i;
+	int mask = (1 << hd->minor_shift) - 1;
 	struct buffer_head *bh;
 	struct disklabel {
 		u32 d_magic;
@@ -351,6 +350,8 @@
 		return 0;
 	}
 	for (i = 0 ; i < label->d_npartitions; i++, partition++) {
+		if ((current_minor & mask) == 0)
+		        break;
 		if (partition->p_size)
 			add_partition(hd, current_minor,
 				first_sector+partition->p_offset,