]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
fs/partitions/sun.c endianness annotations
authorAl Viro <viro@ftp.linux.org.uk>
Sun, 14 Oct 2007 18:34:50 +0000 (19:34 +0100)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 14 Oct 2007 19:41:51 +0000 (12:41 -0700)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/partitions/sun.c

index 794118da4ef3ee04877a1bb2122bf81c977f61fd..c95e6a62c01deb623ac1d817a3dda72b5706671b 100644 (file)
@@ -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;