Update of /cvsroot/linux-mips/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv25707/fs/partitions
Modified Files:
check.c
Log Message:
Synced with Ralf's 2.4.8 code.
Index: check.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/fs/partitions/check.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** check.c 2001/08/25 02:19:28 1.5
--- check.c 2001/08/25 06:24:46 1.6
***************
*** 26,29 ****
--- 26,30 ----
#include "amiga.h"
#include "atari.h"
+ #include "ldm.h"
#include "mac.h"
#include "msdos.h"
***************
*** 46,49 ****
--- 47,53 ----
sgi_partition,
#endif
+ #ifdef CONFIG_LDM_PARTITION
+ ldm_partition, /* this must come before msdos */
+ #endif
#ifdef CONFIG_MSDOS_PARTITION
msdos_partition,
***************
*** 74,77 ****
--- 78,92 ----
/*
+ * This is ucking fugly but its probably the best thing for 2.4.x
+ * Take it as a clear reminder than we should put the device name
+ * generation in the object kdev_t points to in 2.5.
+ */
+
+ #ifdef CONFIG_ARCH_S390
+ int (*genhd_dasd_name)(char*,int,int,struct gendisk*) = NULL;
+ EXPORT_SYMBOL(genhd_dasd_name);
+ #endif
+
+ /*
* disk_name() is used by partition check code and the md driver.
* It formats the devicename of the indicated disk into
***************
*** 79,82 ****
--- 94,98 ----
* a pointer to that same buffer (for convenience).
*/
+
char *disk_name (struct gendisk *hd, int minor, char *buf)
{
***************
*** 93,96 ****
--- 109,118 ----
return buf + pos;
}
+
+ #ifdef CONFIG_ARCH_S390
+ if (genhd_dasd_name
+ && genhd_dasd_name (buf, unit - 'a', part, hd) == 0)
+ return buf;
+ #endif
/*
* IDE devices use multiple major numbers, but the drives
|
