summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorHarald Koerfgen <hkoerfg@web.de>2000-02-19 14:12:13 +0000
committerHarald Koerfgen <hkoerfg@web.de>2000-02-19 14:12:13 +0000
commitad9f21fd1f0d0a80e8b82e34215416664f99805d (patch)
tree08f9209d052352c0d0e8580a50353c6a091d872a /fs
parent15dba00e0329a4c3ab4235ccdfda4ce63b7fd812 (diff)
o default configuration for DECstations added
o minor R3000 and DECstations related fixes
Diffstat (limited to 'fs')
-rw-r--r--fs/partitions/ultrix.c10
-rw-r--r--fs/partitions/ultrix.h6
2 files changed, 7 insertions, 9 deletions
diff --git a/fs/partitions/ultrix.c b/fs/partitions/ultrix.c
index 654a4fbd1..4170a1bf8 100644
--- a/fs/partitions/ultrix.c
+++ b/fs/partitions/ultrix.c
@@ -14,10 +14,10 @@
#include "check.h"
-static int ultrix_partition(struct gendisk *hd, kdev_t dev,
- unsigned long first_sector, int curren_minor)
+int ultrix_partition(struct gendisk *hd, kdev_t dev,
+ unsigned long first_sector, int first_part_minor)
{
- int i, minor = current_minor;
+ int i;
struct buffer_head *bh;
struct ultrix_disklabel {
s32 pt_magic; /* magic no. indicating part. info exits */
@@ -45,9 +45,9 @@ static int ultrix_partition(struct gendisk *hd, kdev_t dev,
- sizeof(struct ultrix_disklabel));
if (label->pt_magic == PT_MAGIC && label->pt_valid == PT_VALID) {
- for (i=0; i<8; i++, minor++)
+ for (i=0; i<8; i++, first_part_minor++)
if (label->pt_part[i].pi_nblocks)
- add_gd_partition(hd, minor,
+ add_gd_partition(hd, first_part_minor,
label->pt_part[i].pi_blkoff,
label->pt_part[i].pi_nblocks);
brelse(bh);
diff --git a/fs/partitions/ultrix.h b/fs/partitions/ultrix.h
index 385a32590..d2259db3e 100644
--- a/fs/partitions/ultrix.h
+++ b/fs/partitions/ultrix.h
@@ -2,8 +2,6 @@
* fs/partitions/ultrix.h
*/
-static int ultrix_partition(struct gendisk *hd, kdev_t dev,
- unsigned long first_sector);
-
-#define SGI_LABEL_MAGIC 0x0be5a941
+int ultrix_partition(struct gendisk *hd, kdev_t dev,
+ unsigned long first_sector, int first_part_minor);