emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some __le -> le issues

Browse Source
This commit is contained in:
Joe Thornber
2013-03-22 15:48:43 +00:00
parent a7081a4789
commit be7801f111
8 changed files with 102 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
thin-provisioning/metadata.cc
View File

@@ -52,7 +52,7 @@ namespace {
superblock_disk *sbd = reinterpret_cast<superblock_disk *>(&b);
crc32c sum(SUPERBLOCK_CSUM_SEED);
sum.append(&sbd->flags_, MD_BLOCK_SIZE - sizeof(uint32_t));
sbd->csum_ = to_disk<base::__le32>(sum.get_sum());
sbd->csum_ = to_disk<base::le32>(sum.get_sum());
}
};

8
thin-provisioning/metadata.h
View File

@@ -83,7 +83,7 @@ namespace thin_provisioning {
};
struct block_traits {
typedef base::__le64 disk_type;
typedef base::le64 disk_type;
typedef block_time value_type;
typedef block_time_ref_counter ref_counter;
@@ -95,7 +95,7 @@ namespace thin_provisioning {
static void pack(value_type const &value, disk_type &disk) {
uint64_t v = (value.block_ << 24) | value.time_;
disk = base::to_disk<base::__le64>(v);
disk = base::to_disk<base::le64>(v);
}
};
@@ -118,7 +118,7 @@ namespace thin_provisioning {
};
struct mtree_traits {
typedef base::__le64 disk_type;
typedef base::le64 disk_type;
typedef uint64_t value_type;
typedef mtree_ref_counter ref_counter;
@@ -127,7 +127,7 @@ namespace thin_provisioning {
}
static void pack(value_type const &value, disk_type &disk) {
disk = base::to_disk<base::__le64>(value);
disk = base::to_disk<base::le64>(value);
}
};

38
thin-provisioning/metadata_disk_structures.cc
View File

@@ -36,10 +36,10 @@ device_details_traits::unpack(device_details_disk const &disk, device_details &v
void
device_details_traits::pack(device_details const &value, device_details_disk &disk)
{
disk.mapped_blocks_ = to_disk<__le64>(value.mapped_blocks_);
disk.transaction_id_ = to_disk<__le64>(value.transaction_id_);
disk.creation_time_ = to_disk<__le32>(value.creation_time_);
disk.snapshotted_time_ = to_disk<__le32>(value.snapshotted_time_);
disk.mapped_blocks_ = to_disk<le64>(value.mapped_blocks_);
disk.transaction_id_ = to_disk<le64>(value.transaction_id_);
disk.creation_time_ = to_disk<le32>(value.creation_time_);
disk.snapshotted_time_ = to_disk<le32>(value.snapshotted_time_);
}
void
@@ -78,17 +78,17 @@ superblock_traits::unpack(superblock_disk const &disk, superblock &value)
void
superblock_traits::pack(superblock const &value, superblock_disk &disk)
{
disk.csum_ = to_disk<__le32>(value.csum_);
disk.flags_ = to_disk<__le32>(value.flags_);
disk.blocknr_ = to_disk<__le64>(value.blocknr_);
disk.csum_ = to_disk<le32>(value.csum_);
disk.flags_ = to_disk<le32>(value.flags_);
disk.blocknr_ = to_disk<le64>(value.blocknr_);
::memcpy(disk.uuid_, value.uuid_, sizeof(disk.uuid_));
disk.magic_ = to_disk<__le64>(value.magic_);
disk.version_ = to_disk<__le32>(value.version_);
disk.time_ = to_disk<__le32>(value.time_);
disk.magic_ = to_disk<le64>(value.magic_);
disk.version_ = to_disk<le32>(value.version_);
disk.time_ = to_disk<le32>(value.time_);
disk.trans_id_ = to_disk<__le64>(value.trans_id_);
disk.metadata_snap_ = to_disk<__le64>(value.metadata_snap_);
disk.trans_id_ = to_disk<le64>(value.trans_id_);
disk.metadata_snap_ = to_disk<le64>(value.metadata_snap_);
::memcpy(disk.data_space_map_root_,
value.data_space_map_root_,
@@ -97,15 +97,15 @@ superblock_traits::pack(superblock const &value, superblock_disk &disk)
value.metadata_space_map_root_,
sizeof(disk.metadata_space_map_root_));
disk.data_mapping_root_ = to_disk<__le64>(value.data_mapping_root_);
disk.device_details_root_ = to_disk<__le64>(value.device_details_root_);
disk.data_block_size_ = to_disk<__le32>(value.data_block_size_);
disk.data_mapping_root_ = to_disk<le64>(value.data_mapping_root_);
disk.device_details_root_ = to_disk<le64>(value.device_details_root_);
disk.data_block_size_ = to_disk<le32>(value.data_block_size_);
disk.metadata_block_size_ = to_disk<__le32>(value.metadata_block_size_);
disk.metadata_nr_blocks_ = to_disk<__le64>(value.metadata_nr_blocks_);
disk.metadata_block_size_ = to_disk<le32>(value.metadata_block_size_);
disk.metadata_nr_blocks_ = to_disk<le64>(value.metadata_nr_blocks_);
disk.compat_flags_ = to_disk<__le32>(value.compat_flags_);
disk.incompat_flags_ = to_disk<__le32>(value.incompat_flags_);
disk.compat_flags_ = to_disk<le32>(value.compat_flags_);
disk.incompat_flags_ = to_disk<le32>(value.incompat_flags_);
}
//----------------------------------------------------------------

40
thin-provisioning/metadata_disk_structures.h
View File

@@ -28,10 +28,10 @@ namespace thin_provisioning {
using namespace base; // FIXME: don't use namespaces in headers.
struct device_details_disk {
__le64 mapped_blocks_;
__le64 transaction_id_; /* when created */
__le32 creation_time_;
__le32 snapshotted_time_;
le64 mapped_blocks_;
le64 transaction_id_; /* when created */
le32 creation_time_;
le32 snapshotted_time_;
} __attribute__ ((packed));
struct device_details {
@@ -55,36 +55,36 @@ namespace thin_provisioning {
typedef unsigned char __u8;
struct superblock_disk {
__le32 csum_;
__le32 flags_;
__le64 blocknr_;
le32 csum_;
le32 flags_;
le64 blocknr_;
__u8 uuid_[16];
__le64 magic_;
__le32 version_;
__le32 time_;
le64 magic_;
le32 version_;
le32 time_;
__le64 trans_id_;
le64 trans_id_;
/* root for userspace's transaction (for migration and friends) */
__le64 metadata_snap_;
le64 metadata_snap_;
__u8 data_space_map_root_[SPACE_MAP_ROOT_SIZE];
__u8 metadata_space_map_root_[SPACE_MAP_ROOT_SIZE];
/* 2 level btree mapping (dev_id, (dev block, time)) -> data block */
__le64 data_mapping_root_;
le64 data_mapping_root_;
/* device detail root mapping dev_id -> device_details */
__le64 device_details_root_;
le64 device_details_root_;
__le32 data_block_size_; /* in 512-byte sectors */
le32 data_block_size_; /* in 512-byte sectors */
__le32 metadata_block_size_; /* in 512-byte sectors */
__le64 metadata_nr_blocks_;
le32 metadata_block_size_; /* in 512-byte sectors */
le64 metadata_nr_blocks_;
__le32 compat_flags_;
__le32 compat_ro_flags_;
__le32 incompat_flags_;
le32 compat_flags_;
le32 compat_ro_flags_;
le32 incompat_flags_;
} __attribute__ ((packed));
struct superblock {