aboutsummaryrefslogtreecommitdiff
path: root/fs/partitions
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-10-14 19:34:50 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-14 12:41:51 -0700
commitb1519d047ca55406e0fc3dd2b8de266f971ea210 (patch)
treeeddb95968b1a8ce1ccf0339656ff56b17607e90a /fs/partitions
parent1ccc9147f6a063c42fef67acff34de18435a4a6b (diff)
fs/partitions/sun.c endianness annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/partitions')
-rw-r--r--fs/partitions/sun.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/partitions/sun.c b/fs/partitions/sun.c
index 794118da4ef..c95e6a62c01 100644
--- a/fs/partitions/sun.c
+++ b/fs/partitions/sun.c
@@ -95,8 +95,8 @@ int sun_partition(struct parsed_partitions *state, struct block_device *bdev)
* So that old Linux-Sun partitions continue to work,
* alow the VTOC to be used under the additional condition ...
*/
- use_vtoc = use_vtoc || !(label->vtoc.sanity |
- label->vtoc.version | label->vtoc.nparts);
+ use_vtoc = use_vtoc || !(label->vtoc.sanity ||
+ label->vtoc.version || label->vtoc.nparts);
spc = be16_to_cpu(label->ntrks) * be16_to_cpu(label->nsect);
for (i = 0; i < nparts; i++, p++) {
unsigned long st_sector;