diff options
| author | Cesar Eduardo Barros <cesarb@cesarb.net> | 2010-04-17 18:28:09 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-05-21 18:31:21 -0400 |
| commit | cc9106247de92549e50abb0ba12d6b2fdbf0be55 (patch) | |
| tree | f0e76e94e4b0041c255b9f3d4f3e5217b37951d2 | |
| parent | 8018ab057480974e7f26a387bf4ce040e9a5f6f1 (diff) | |
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
)
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/partitions/efi.c | 2 | ||||
| -rw-r--r-- | fs/partitions/mac.c | 2 | ||||
| -rw-r--r-- | fs/partitions/msdos.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/partitions/efi.c b/fs/partitions/efi.c index 91babdae7587..f5867f8ed214 100644 --- a/fs/partitions/efi.c +++ b/fs/partitions/efi.c | |||
| @@ -631,7 +631,7 @@ efi_partition(struct parsed_partitions *state, struct block_device *bdev) | |||
| 631 | /* If this is a RAID volume, tell md */ | 631 | /* If this is a RAID volume, tell md */ |
| 632 | if (!efi_guidcmp(ptes[i].partition_type_guid, | 632 | if (!efi_guidcmp(ptes[i].partition_type_guid, |
| 633 | PARTITION_LINUX_RAID_GUID)) | 633 | PARTITION_LINUX_RAID_GUID)) |
| 634 | state->parts[i+1].flags = 1; | 634 | state->parts[i + 1].flags = ADDPART_FLAG_RAID; |
| 635 | } | 635 | } |
| 636 | kfree(ptes); | 636 | kfree(ptes); |
| 637 | kfree(gpt); | 637 | kfree(gpt); |
diff --git a/fs/partitions/mac.c b/fs/partitions/mac.c index d4a0fad3563b..dece9b4c881f 100644 --- a/fs/partitions/mac.c +++ b/fs/partitions/mac.c | |||
| @@ -75,7 +75,7 @@ int mac_partition(struct parsed_partitions *state, struct block_device *bdev) | |||
| 75 | be32_to_cpu(part->block_count) * (secsize/512)); | 75 | be32_to_cpu(part->block_count) * (secsize/512)); |
| 76 | 76 | ||
| 77 | if (!strnicmp(part->type, "Linux_RAID", 10)) | 77 | if (!strnicmp(part->type, "Linux_RAID", 10)) |
| 78 | state->parts[slot].flags = 1; | 78 | state->parts[slot].flags = ADDPART_FLAG_RAID; |
| 79 | #ifdef CONFIG_PPC_PMAC | 79 | #ifdef CONFIG_PPC_PMAC |
| 80 | /* | 80 | /* |
| 81 | * If this is the first bootable partition, tell the | 81 | * If this is the first bootable partition, tell the |
diff --git a/fs/partitions/msdos.c b/fs/partitions/msdos.c index 90be97f1f5a8..efe3df75f84d 100644 --- a/fs/partitions/msdos.c +++ b/fs/partitions/msdos.c | |||
| @@ -509,7 +509,7 @@ int msdos_partition(struct parsed_partitions *state, struct block_device *bdev) | |||
| 509 | } | 509 | } |
| 510 | put_partition(state, slot, start, size); | 510 | put_partition(state, slot, start, size); |
| 511 | if (SYS_IND(p) == LINUX_RAID_PARTITION) | 511 | if (SYS_IND(p) == LINUX_RAID_PARTITION) |
| 512 | state->parts[slot].flags = 1; | 512 | state->parts[slot].flags = ADDPART_FLAG_RAID; |
| 513 | if (SYS_IND(p) == DM6_PARTITION) | 513 | if (SYS_IND(p) == DM6_PARTITION) |
| 514 | printk("[DM]"); | 514 | printk("[DM]"); |
| 515 | if (SYS_IND(p) == EZD_PARTITION) | 515 | if (SYS_IND(p) == EZD_PARTITION) |
