diff options
| author |   Zach Brown <zab@redhat.com> | 2013-02-20 00:55:13 +0000 |
|---|---|---|
| committer |   Josef Bacik <jbacik@fusionio.com> | 2013-02-20 13:00:01 -0500 |
| commit | cdb4c5748cb3ac533889a6b0b95aa10651e68785 (patch) | |
| tree | 1c1ca874a564e824fd4b824c29a04ed7ec4936a6 /fs/btrfs/check-integrity.c | |
| parent | Btrfs: set/change the label of a mounted file system (diff) | |
| download | linux-dev-cdb4c5748cb3ac533889a6b0b95aa10651e68785.tar.xz linux-dev-cdb4c5748cb3ac533889a6b0b95aa10651e68785.zip | |
btrfs: define BTRFS_MAGIC as a u64 value
super.magic is an le64 but it's treated as an unterminated string when
compared against BTRFS_MAGIC which is defined as a string. Instead
define BTRFS_MAGIC as a normal hex value and use endian helpers to
compare it to the super's magic.
I tested this by mounting an fs made before the change and made sure
that it didn't introduce sparse errors. This matches a similar cleanup
that is pending in btrfs-progs. David Sterba pointed out that we should
fix the kernel side as well :).
Signed-off-by: Zach Brown <zab@redhat.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to 'fs/btrfs/check-integrity.c')
| -rw-r--r-- | fs/btrfs/check-integrity.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index 11d47bfb62b4..18af6f48781a 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c @@ -813,8 +813,7 @@ static int btrfsic_process_superblock_dev_mirror( (bh->b_data + (dev_bytenr & 4095)); if (btrfs_super_bytenr(super_tmp) != dev_bytenr || - strncmp((char *)(&(super_tmp->magic)), BTRFS_MAGIC, - sizeof(super_tmp->magic)) || + super_tmp->magic != cpu_to_le64(BTRFS_MAGIC) || memcmp(device->uuid, super_tmp->dev_item.uuid, BTRFS_UUID_SIZE) || btrfs_super_nodesize(super_tmp) != state->metablock_size || btrfs_super_leafsize(super_tmp) != state->metablock_size || |