]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
libblkid: fix NTFS prober on big-endian machines
authorKarel Zak <kzak@redhat.com>
Wed, 27 Mar 2013 10:37:57 +0000 (11:37 +0100)
committerKarel Zak <kzak@redhat.com>
Wed, 27 Mar 2013 10:37:57 +0000 (11:37 +0100)
 MFT_RECORD_ATTR_VOLUME_NAME  = cpu_to_le32(0x60),
                                 ^
./include/bitops.h:94:36: error: braced-group within expression
allowed only inside a function

Signed-off-by: Karel Zak <kzak@redhat.com>
libblkid/src/superblocks/ntfs.c

index 41c6b9cd5fe5e2aea417572b42a0fd66e6b51e48..c60a1519bc869f1be7c4eff91c10daa8611e8ee6 100644 (file)
@@ -75,8 +75,8 @@ struct file_attribute {
 #define NTFS_MAX_CLUSTER_SIZE  (64 * 1024)
 
 enum {
-       MFT_RECORD_ATTR_VOLUME_NAME             = cpu_to_le32(0x60),
-       MFT_RECORD_ATTR_END                     = cpu_to_le32(0xffffffff)
+       MFT_RECORD_ATTR_VOLUME_NAME             = 0x60,
+       MFT_RECORD_ATTR_END                     = 0xffffffff
 };
 
 static int probe_ntfs(blkid_probe pr, const struct blkid_idmag *mag)
@@ -186,9 +186,9 @@ static int probe_ntfs(blkid_probe pr, const struct blkid_idmag *mag)
                if (!attr_len)
                        break;
 
-               if (attr->type == MFT_RECORD_ATTR_END)
+               if (le32_to_cpu(attr->type) == MFT_RECORD_ATTR_END)
                        break;
-               if (attr->type == MFT_RECORD_ATTR_VOLUME_NAME) {
+               if (le32_to_cpu(attr->type) == MFT_RECORD_ATTR_VOLUME_NAME) {
                        unsigned int val_off = le16_to_cpu(attr->value_offset);
                        unsigned int val_len = le32_to_cpu(attr->value_len);
                        unsigned char *val = ((uint8_t *) attr) + val_off;