Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc910624 authored by Cesar Eduardo Barros's avatar Cesar Eduardo Barros Committed by Al Viro
Browse files

fs/partitions: use ADDPART_FLAG_RAID instead of magic number 



ADDPART_FLAG_RAID was introduced in commit d18d7682, and most places were
converted to use it instead of a hardcoded value. However, some places seem
to have been missed.

Change all of them to the symbolic names via the following semantic patch:

@@
struct parsed_partitions *state;
expression E;
@@
(
- state->parts[E].flags = 1
+ state->parts[E].flags = ADDPART_FLAG_RAID
|
- state->parts[E].flags |= 1
+ state->parts[E].flags |= ADDPART_FLAG_RAID
|
- state->parts[E].flags = 2
+ state->parts[E].flags = ADDPART_FLAG_WHOLEDISK
|
- state->parts[E].flags |= 2
+ state->parts[E].flags |= ADDPART_FLAG_WHOLEDISK
)

Signed-off-by: default avatarCesar Eduardo Barros <cesarb@cesarb.net>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 8018ab05

fs/partitions/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ efi_partition(struct parsed_partitions *state, struct block_device *bdev) 
		/* If this is a RAID volume, tell md */

		if (!efi_guidcmp(ptes[i].partition_type_guid,

				 PARTITION_LINUX_RAID_GUID))

			state->parts[i+1].flags = 1;

			state->parts[i + 1].flags = ADDPART_FLAG_RAID;

	}

	kfree(ptes);

	kfree(gpt);

fs/partitions/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ int mac_partition(struct parsed_partitions *state, struct block_device *bdev) 
			be32_to_cpu(part->block_count) * (secsize/512));



		if (!strnicmp(part->type, "Linux_RAID", 10))

			state->parts[slot].flags = 1;

			state->parts[slot].flags = ADDPART_FLAG_RAID;

#ifdef CONFIG_PPC_PMAC

		/*

		 * If this is the first bootable partition, tell the

fs/partitions/msdos.c

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ int msdos_partition(struct parsed_partitions *state, struct block_device *bdev) 
		}

		put_partition(state, slot, start, size);

		if (SYS_IND(p) == LINUX_RAID_PARTITION)

			state->parts[slot].flags = 1;

			state->parts[slot].flags = ADDPART_FLAG_RAID;

		if (SYS_IND(p) == DM6_PARTITION)

			printk("[DM]");

		if (SYS_IND(p) == EZD_PARTITION)