partitions/msdos: remove LINUX_SWAP_PARTITION

Just always use NEW_SOLARIS_X86_PARTITION and explain the situation,
as that is less confusing than two names for a single value.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/partitions/msdos.c b/block/partitions/msdos.c
index 88ee5ee7f442b2bb657fdc888234e865d1764ec6..e44e2f0a02cc5c00b1cfd9f183b6970b987cbbf2 100644 (file)
--- a/block/partitions/msdos.c
+++ b/block/partitions/msdos.c
@@ -77,13 +77,19 @@ static int aix_magic_present(struct parsed_partitions *state, unsigned char *p)
                p[2] == AIX_LABEL_MAGIC3 &&
                p[3] == AIX_LABEL_MAGIC4))
                return 0;
-       /* Assume the partition table is valid if Linux partitions exists */
+
+       /*
+        * Assume the partition table is valid if Linux partitions exists.
+        * Note that old Solaris/x86 partitions use the same indicator as
+        * Linux swap partitions, so we consider that a Linux partition as
+        * well.
+        */
        for (slot = 1; slot <= 4; slot++, pt++) {
-               if (pt->sys_ind == LINUX_SWAP_PARTITION ||
-                       pt->sys_ind == LINUX_RAID_PARTITION ||
-                       pt->sys_ind == LINUX_DATA_PARTITION ||
-                       pt->sys_ind == LINUX_LVM_PARTITION ||
-                       is_extended_partition(pt))
+               if (pt->sys_ind == SOLARIS_X86_PARTITION ||
+                   pt->sys_ind == LINUX_RAID_PARTITION ||
+                   pt->sys_ind == LINUX_DATA_PARTITION ||
+                   pt->sys_ind == LINUX_LVM_PARTITION ||
+                   is_extended_partition(pt))
                        return 0;
        }
        d = read_part_sector(state, 7, &sect);

diff --git a/include/linux/msdos_partition.h b/include/linux/msdos_partition.h
index e151af072cd15dbea57403f345154bb05f37e405..2cb82db2a43cadc2699fc992f725134695aa9ebd 100644 (file)
--- a/include/linux/msdos_partition.h
+++ b/include/linux/msdos_partition.h
@@ -27,12 +27,11 @@ enum msdos_sys_ind {
        LINUX_EXTENDED_PARTITION = 0x85,
        WIN98_EXTENDED_PARTITION = 0x0f,
 
-       LINUX_SWAP_PARTITION = 0x82,
        LINUX_DATA_PARTITION = 0x83,
        LINUX_LVM_PARTITION = 0x8e,
        LINUX_RAID_PARTITION = 0xfd,    /* autodetect RAID partition */
 
-       SOLARIS_X86_PARTITION = LINUX_SWAP_PARTITION,
+       SOLARIS_X86_PARTITION = 0x82,   /* also Linux swap partitions */
        NEW_SOLARIS_X86_PARTITION = 0xbf,
 
        DM6_AUX1PARTITION = 0x51,       /* no DDO:  use xlated geom */