From 93e665221a6ffd3ad408c3ee802106ec5efe7e83 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 14 Oct 2007 19:34:50 +0100 Subject: [PATCH] --- yaml --- r: 68685 b: refs/heads/master c: b1519d047ca55406e0fc3dd2b8de266f971ea210 h: refs/heads/master i: 68683: 551bd2f4e2c00c148ac8ac77026aaa5641758c65 v: v3 --- [refs] | 2 +- trunk/fs/partitions/sun.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 82ba215cfddf..637784d84217 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ccc9147f6a063c42fef67acff34de18435a4a6b +refs/heads/master: b1519d047ca55406e0fc3dd2b8de266f971ea210 diff --git a/trunk/fs/partitions/sun.c b/trunk/fs/partitions/sun.c index 794118da4ef3..c95e6a62c01d 100644 --- a/trunk/fs/partitions/sun.c +++ b/trunk/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;