6 files changed, 133 insertions, 29 deletions

diff --git a/fs/partitions/Kconfig b/fs/partitions/Kconfig
index 656bc43431b9..c9a478099281 100644
--- a/fs/partitions/Kconfig
+++ b/fs/partitions/Kconfig
@@ -21,26 +21,30 @@ config ACORN_PARTITION
           Support hard disks partitioned under Acorn operating systems.
 
 config ACORN_PARTITION_CUMANA
-        bool "Cumana partition support" if PARTITION_ADVANCED && ACORN_PARTITION
+        bool "Cumana partition support" if PARTITION_ADVANCED
         default y if ARCH_ACORN
+        depends on ACORN_PARTITION
         help
           Say Y here if you would like to use hard disks under Linux which
           were partitioned using the Cumana interface on Acorn machines.
 
 config ACORN_PARTITION_EESOX
-        bool "EESOX partition support" if PARTITION_ADVANCED && ACORN_PARTITION
+        bool "EESOX partition support" if PARTITION_ADVANCED
         default y if ARCH_ACORN
+        depends on ACORN_PARTITION
 
 config ACORN_PARTITION_ICS
-        bool "ICS partition support" if PARTITION_ADVANCED && ACORN_PARTITION
+        bool "ICS partition support" if PARTITION_ADVANCED
         default y if ARCH_ACORN
+        depends on ACORN_PARTITION
         help
           Say Y here if you would like to use hard disks under Linux which
           were partitioned using the ICS interface on Acorn machines.
 
 config ACORN_PARTITION_ADFS
-        bool "Native filecore partition support" if PARTITION_ADVANCED && ACORN_PARTITION
+        bool "Native filecore partition support" if PARTITION_ADVANCED
         default y if ARCH_ACORN
+        depends on ACORN_PARTITION
         help
           The Acorn Disc Filing System is the standard file system of the
           RiscOS operating system which runs on Acorn's ARM-based Risc PC
@@ -48,15 +52,17 @@ config ACORN_PARTITION_ADFS
           `Y' here, Linux will support disk partitions created under ADFS.
 
 config ACORN_PARTITION_POWERTEC
-        bool "PowerTec partition support" if PARTITION_ADVANCED && ACORN_PARTITION
+        bool "PowerTec partition support" if PARTITION_ADVANCED
         default y if ARCH_ACORN
+        depends on ACORN_PARTITION
         help
           Support reading partition tables created on Acorn machines using
           the PowerTec SCSI drive.
 
 config ACORN_PARTITION_RISCIX
-        bool "RISCiX partition support" if PARTITION_ADVANCED && ACORN_PARTITION
+        bool "RISCiX partition support" if PARTITION_ADVANCED
         default y if ARCH_ACORN
+        depends on ACORN_PARTITION
         help
           Once upon a time, there was a native Unix port for the Acorn series
           of machines called RISCiX.  If you say 'Y' here, Linux will be able
@@ -85,7 +91,7 @@ config ATARI_PARTITION
 
 config IBM_PARTITION
         bool "IBM disk label and partition support"
-        depends on PARTITION_ADVANCED && ARCH_S390
+        depends on PARTITION_ADVANCED && S390
         help
           Say Y here if you would like to be able to read the hard disk
           partition table format used by IBM DASD disks operating under CMS.
@@ -216,6 +222,13 @@ config SUN_PARTITION
           given by the tar program ("man tar" or preferably "info tar"). If
           you don't know what all this is about, say N.
 
+config KARMA_PARTITION
+        bool "Karma Partition support"
+        depends on PARTITION_ADVANCED
+        help
+          Say Y here if you would like to mount the Rio Karma MP3 player, as it
+          uses a proprietary partition table.
+
 config EFI_PARTITION
         bool "EFI GUID Partition support"
         depends on PARTITION_ADVANCED
@@ -224,5 +237,3 @@ config EFI_PARTITION
           Say Y here if you would like to use hard disks under Linux which
           were partitioned using EFI GPT.  Presently only useful on the
           IA-64 platform.
-
-#      define_bool CONFIG_ACORN_PARTITION_CUMANA y
diff --git a/fs/partitions/Makefile b/fs/partitions/Makefile
index 66d5cc26fafb..42c7d3878ed0 100644
--- a/fs/partitions/Makefile
+++ b/fs/partitions/Makefile
@@ -17,3 +17,4 @@ obj-$(CONFIG_SUN_PARTITION) += sun.o
 obj-$(CONFIG_ULTRIX_PARTITION) += ultrix.o
 obj-$(CONFIG_IBM_PARTITION) += ibm.o
 obj-$(CONFIG_EFI_PARTITION) += efi.o
+obj-$(CONFIG_KARMA_PARTITION) += karma.o
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 8dc1822a7022..f924f459bdb8 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -35,6 +35,7 @@
 #include "ibm.h"
 #include "ultrix.h"
 #include "efi.h"
+#include "karma.h"
 
 #ifdef CONFIG_BLK_DEV_MD
 extern void md_autodetect_dev(dev_t dev);
@@ -103,6 +104,9 @@ static int (*check_part[])(struct parsed_partitions *, struct block_device *) =
 #ifdef CONFIG_IBM_PARTITION
         ibm_partition,
 #endif
+#ifdef CONFIG_KARMA_PARTITION
+        karma_partition,
+#endif
         NULL
 };
  
@@ -226,7 +230,7 @@ static struct sysfs_ops part_sysfs_ops = {
 static ssize_t part_uevent_store(struct hd_struct * p,
                                  const char *page, size_t count)
 {
-        kobject_hotplug(&p->kobj, KOBJ_ADD);
+        kobject_uevent(&p->kobj, KOBJ_ADD);
         return count;
 }
 static ssize_t part_dev_read(struct hd_struct * p, char *page)
@@ -336,12 +340,31 @@ void add_partition(struct gendisk *disk, int part, sector_t start, sector_t len)
         disk->part[part-1] = p;
 }
 
+static char *make_block_name(struct gendisk *disk)
+{
+        char *name;
+        static char *block_str = "block:";
+        int size;
+
+        size = strlen(block_str) + strlen(disk->disk_name) + 1;
+        name = kmalloc(size, GFP_KERNEL);
+        if (!name)
+                return NULL;
+        strcpy(name, block_str);
+        strcat(name, disk->disk_name);
+        return name;
+}
+
 static void disk_sysfs_symlinks(struct gendisk *disk)
 {
         struct device *target = get_device(disk->driverfs_dev);
         if (target) {
+                char *disk_name = make_block_name(disk);
                 sysfs_create_link(&disk->kobj,&target->kobj,"device");
-                sysfs_create_link(&target->kobj,&disk->kobj,"block");
+                if (disk_name) {
+                        sysfs_create_link(&target->kobj,&disk->kobj,disk_name);
+                        kfree(disk_name);
+                }
         }
 }
 
@@ -360,7 +383,7 @@ void register_disk(struct gendisk *disk)
         if ((err = kobject_add(&disk->kobj)))
                 return;
         disk_sysfs_symlinks(disk);
-        kobject_hotplug(&disk->kobj, KOBJ_ADD);
+        kobject_uevent(&disk->kobj, KOBJ_ADD);
 
         /* No minors to use for partitions */
         if (disk->minors == 1) {
@@ -461,10 +484,14 @@ void del_gendisk(struct gendisk *disk)
         devfs_remove_disk(disk);
 
         if (disk->driverfs_dev) {
+                char *disk_name = make_block_name(disk);
                 sysfs_remove_link(&disk->kobj, "device");
-                sysfs_remove_link(&disk->driverfs_dev->kobj, "block");
+                if (disk_name) {
+                        sysfs_remove_link(&disk->driverfs_dev->kobj, disk_name);
+                        kfree(disk_name);
+                }
                 put_device(disk->driverfs_dev);
         }
-        kobject_hotplug(&disk->kobj, KOBJ_REMOVE);
+        kobject_uevent(&disk->kobj, KOBJ_REMOVE);
         kobject_del(&disk->kobj);
 }
diff --git a/fs/partitions/ibm.c b/fs/partitions/ibm.c
index 6327bcb2d73d..78010ad60e47 100644
--- a/fs/partitions/ibm.c
+++ b/fs/partitions/ibm.c
@@ -56,7 +56,10 @@ ibm_partition(struct parsed_partitions *state, struct block_device *bdev)
         struct hd_geometry *geo;
         char type[5] = {0,};
         char name[7] = {0,};
-        struct vtoc_volume_label *vlabel;
+        union label_t {
+                struct vtoc_volume_label vol;
+                struct vtoc_cms_label cms;
+        } *label;
         unsigned char *data;
         Sector sect;
 
@@ -64,9 +67,8 @@ ibm_partition(struct parsed_partitions *state, struct block_device *bdev)
                 goto out_noinfo;
         if ((geo = kmalloc(sizeof(struct hd_geometry), GFP_KERNEL)) == NULL)
                 goto out_nogeo;
-        if ((vlabel = kmalloc(sizeof(struct vtoc_volume_label),
-                              GFP_KERNEL)) == NULL)
-                goto out_novlab;
+        if ((label = kmalloc(sizeof(union label_t), GFP_KERNEL)) == NULL)
+                goto out_nolab;
         
         if (ioctl_by_bdev(bdev, BIODASDINFO, (unsigned long)info) != 0 ||
             ioctl_by_bdev(bdev, HDIO_GETGEO, (unsigned long)geo) != 0)
@@ -87,7 +89,7 @@ ibm_partition(struct parsed_partitions *state, struct block_device *bdev)
                 strncpy(name, data + 8, 6);
         else
                 strncpy(name, data + 4, 6);
-        memcpy (vlabel, data, sizeof(struct vtoc_volume_label));
+        memcpy(label, data, sizeof(union label_t));
         put_dev_sector(sect);
 
         EBCASC(type, 4);
@@ -100,14 +102,12 @@ ibm_partition(struct parsed_partitions *state, struct block_device *bdev)
                 /*
                  * VM style CMS1 labeled disk
                  */
-                int *label = (int *) vlabel;
-
-                if (label[13] != 0) {
+                if (label->cms.disk_offset != 0) {
                         printk("CMS1/%8s(MDSK):", name);
                         /* disk is reserved minidisk */
-                        blocksize = label[3];
-                        offset = label[13];
-                        size = (label[7] - 1)*(blocksize >> 9);
+                        blocksize = label->cms.block_size;
+                        offset = label->cms.disk_offset;
+                        size = (label->cms.block_count - 1) * (blocksize >> 9);
                 } else {
                         printk("CMS1/%8s:", name);
                         offset = (info->label_block + 1);
@@ -126,7 +126,7 @@ ibm_partition(struct parsed_partitions *state, struct block_device *bdev)
                 printk("VOL1/%8s:", name);
 
                 /* get block number and read then go through format1 labels */
-                blk = cchhb2blk(&vlabel->vtoc, geo) + 1;
+                blk = cchhb2blk(&label->vol.vtoc, geo) + 1;
                 counter = 0;
                 while ((data = read_dev_sector(bdev, blk*(blocksize/512),
                                                &sect)) != NULL) {
@@ -174,7 +174,7 @@ ibm_partition(struct parsed_partitions *state, struct block_device *bdev)
         }
 
         printk("\n");
-        kfree(vlabel);
+        kfree(label);
         kfree(geo);
         kfree(info);
         return 1;
@@ -182,8 +182,8 @@ ibm_partition(struct parsed_partitions *state, struct block_device *bdev)
 out_readerr:
 out_badsect:
 out_noioctl:
-        kfree(vlabel);
-out_novlab:
+        kfree(label);
+out_nolab:
         kfree(geo);
 out_nogeo:
         kfree(info);
diff --git a/fs/partitions/karma.c b/fs/partitions/karma.c
new file mode 100644
index 000000000000..176d89bcf123
--- /dev/null
+++ b/fs/partitions/karma.c
@@ -0,0 +1,57 @@
+/*
+ *  fs/partitions/karma.c
+ *  Rio Karma partition info.
+ *
+ *  Copyright (C) 2006 Bob Copeland (me@bobcopeland.com)
+ *  based on osf.c
+ */
+
+#include "check.h"
+#include "karma.h"
+
+int karma_partition(struct parsed_partitions *state, struct block_device *bdev)
+{
+        int i;
+        int slot = 1;
+        Sector sect;
+        unsigned char *data;
+        struct disklabel {
+                u8 d_reserved[270];
+                struct d_partition {
+                        __le32 p_res;
+                        u8 p_fstype;
+                        u8 p_res2[3];
+                        __le32 p_offset;
+                        __le32 p_size;
+                } d_partitions[2];
+                u8 d_blank[208];
+                __le16 d_magic;
+        } __attribute__((packed)) *label;
+        struct d_partition *p;
+
+        data = read_dev_sector(bdev, 0, &sect);
+        if (!data)
+                return -1;
+
+        label = (struct disklabel *)data;
+        if (le16_to_cpu(label->d_magic) != KARMA_LABEL_MAGIC) {
+                put_dev_sector(sect);
+                return 0;
+        }
+
+        p = label->d_partitions;
+        for (i = 0 ; i < 2; i++, p++) {
+                if (slot == state->limit)
+                        break;
+
+                if (p->p_fstype == 0x4d && le32_to_cpu(p->p_size)) {
+                        put_partition(state, slot, le32_to_cpu(p->p_offset),
+                                le32_to_cpu(p->p_size));
+                }
+                slot++;
+        }
+        printk("\n");
+        put_dev_sector(sect);
+        return 1;
+}
+
diff --git a/fs/partitions/karma.h b/fs/partitions/karma.h
new file mode 100644
index 000000000000..ecf7d3f2a3d8
--- /dev/null
+++ b/fs/partitions/karma.h
@@ -0,0 +1,8 @@
+/*
+ *  fs/partitions/karma.h
+ */
+
+#define KARMA_LABEL_MAGIC               0xAB56
+
+int karma_partition(struct parsed_partitions *state, struct block_device *bdev);
+