Skip to contentSkip to conversation

fs/partitions: use ADDPART_FLAG_RAID instead of magic number

PATCH In review Cesar Eduardo Barros 2 participants 2 messages Apr 17, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fs/partitions: use ADDPART_FLAG_RAID instead of magic number

ADDPART_FLAG_RAID was introduced in commit d18d768, 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
)

---
 fs/partitions/efi.c   |    2 +-
 fs/partitions/mac.c   |    2 +-
 fs/partitions/msdos.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
fs/partitions/efi.c +1 -1
index 91babda..f5867f8 100644
@@ -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
index d4a0fad..dece9b4 100644
@@ -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
index 90be97f..efe3df7 100644
@@ -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)
Signature · 1 line
1.6.6.1
Acked-by on v1 1/1
#1 lore raw

From: Cesar Eduardo Barros <[email protected]>
Date: Sat, 17 Apr 2010 19:28:09 -0300

Quoted 5 lines

ADDPART_FLAG_RAID was introduced in commit d18d768, 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:

...

Quoted 1 line