patch-2.4.0-test9 linux/fs/partitions/check.c

• Lines: 37
• Date: Wed Sep 27 13:39:23 2000
• Orig file: v2.4.0-test8/linux/fs/partitions/check.c
• Orig date: Mon Aug 28 21:29:17 2000

diff -u --recursive --new-file v2.4.0-test8/linux/fs/partitions/check.c linux/fs/partitions/check.c
@@ -146,6 +146,16 @@
  			sprintf(buf, "%s/c%dd%dp%d", maj, ctlr, disk, part);
  		return buf;
  	}
+	if (hd->major >= COMPAQ_CISS_MAJOR && hd->major <= COMPAQ_CISS_MAJOR+7) {
+                int ctlr = hd->major - COMPAQ_CISS_MAJOR;
+                int disk = minor >> hd->minor_shift;
+                int part = minor & (( 1 << hd->minor_shift) - 1);
+                if (part == 0)
+                        sprintf(buf, "%s/c%dd%d", maj, ctlr, disk);
+                else
+                        sprintf(buf, "%s/c%dd%dp%d", maj, ctlr, disk, part);
+                return buf;
+	}
 	if (hd->major >= DAC960_MAJOR && hd->major <= DAC960_MAJOR+7) {
 		int ctlr = hd->major - DAC960_MAJOR;
  		int disk = minor >> hd->minor_shift;
@@ -177,7 +187,8 @@
 #ifdef CONFIG_DEVFS_FS
 	printk(" p%d", (minor & ((1 << hd->minor_shift) - 1)));
 #else
-	if (hd->major >= COMPAQ_SMART2_MAJOR+0 && hd->major <= COMPAQ_SMART2_MAJOR+7)
+	if ((hd->major >= COMPAQ_SMART2_MAJOR+0 && hd->major <= COMPAQ_SMART2_MAJOR+7) ||
+	    (hd->major >= COMPAQ_CISS_MAJOR+0 && hd->major <= COMPAQ_CISS_MAJOR+7))
 		printk(" p%d", (minor & ((1 << hd->minor_shift) - 1)));
 	else
 		printk(" %s", disk_name(hd, minor, buf));
@@ -438,9 +449,6 @@
 	else
 #endif
 	rd_load();
-#endif
-#ifdef CONFIG_BLK_DEV_MD
-	md_run_setup();
 #endif
 	return 0;
 }