---

yaml --- r: 68685 b: refs/heads/master c: b1519d0 h: refs/heads/master i: 68683: 551bd2f v: v3
git-mirror · Oct 14, 2007 · 93e6652 · 93e6652
1 parent 7485c79
commit 93e6652
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;