summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCesar Eduardo Barros <cesarb@cesarb.net>2010-04-17 19:28:09 -0300
committerAl Viro <viro@zeniv.linux.org.uk>2010-05-21 18:31:21 -0400
commitcc9106247de92549e50abb0ba12d6b2fdbf0be55 (patch)
treef0e76e94e4b0041c255b9f3d4f3e5217b37951d2
parent8018ab057480974e7f26a387bf4ce040e9a5f6f1 (diff)
downloadop-kernel-dev-cc9106247de92549e50abb0ba12d6b2fdbf0be55.zip
op-kernel-dev-cc9106247de92549e50abb0ba12d6b2fdbf0be55.tar.gz
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.c2
-rw-r--r--fs/partitions/mac.c2
-rw-r--r--fs/partitions/msdos.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/partitions/efi.c b/fs/partitions/efi.c
index 91babda..f5867f8 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)
/* 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);
diff --git a/fs/partitions/mac.c b/fs/partitions/mac.c
index d4a0fad..dece9b4 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)
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
diff --git a/fs/partitions/msdos.c b/fs/partitions/msdos.c
index 90be97f..efe3df7 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)
}
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)
OpenPOWER on IntegriCloud