From 8b526beba82fdcf6859adbf728703ebf8bd751d5 Mon Sep 17 00:00:00 2001 From: mulhern Date: Thu, 14 Sep 2017 15:24:07 -0400 Subject: [PATCH] Update for new devicemapper consts interface. Remove IEC definition in stratisd. Alphabetize as necessary. Signed-off-by: mulhern --- src/engine/consts.rs | 15 --------------- src/engine/mod.rs | 3 +-- src/engine/sim_engine/pool.rs | 3 +-- src/engine/strat_engine/blockdevmgr.rs | 3 +-- src/engine/strat_engine/device.rs | 4 +--- src/engine/strat_engine/filesystem.rs | 4 ++-- src/engine/strat_engine/metadata.rs | 8 ++------ src/engine/strat_engine/thinpool.rs | 5 ++--- tests/util/blockdev_tests.rs | 3 +-- tests/util/dm_tests.rs | 9 ++------- tests/util/filesystem_tests.rs | 4 +--- tests/util/pool_tests.rs | 5 +---- 12 files changed, 15 insertions(+), 51 deletions(-) delete mode 100644 src/engine/consts.rs diff --git a/src/engine/consts.rs b/src/engine/consts.rs deleted file mode 100644 index a06cdcccd5f..00000000000 --- a/src/engine/consts.rs +++ /dev/null @@ -1,15 +0,0 @@ -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at http://mozilla.org/MPL/2.0/. - -#[allow(non_upper_case_globals)] -#[allow(non_snake_case)] -pub mod IEC { - pub const Ki: u64 = 1024; - pub const Mi: u64 = 1024 * Ki; - pub const Gi: u64 = 1024 * Mi; - pub const Ti: u64 = 1024 * Gi; - pub const Pi: u64 = 1024 * Ti; - pub const Ei: u64 = 1024 * Pi; - // Ei is the maximum IEC unit expressible in u64. -} diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 8468daeffdc..7123474972a 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -2,7 +2,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -pub use self::consts::IEC; +pub use devicemapper::{IEC, SECTOR_SIZE}; pub use self::engine::BlockDev; pub use self::engine::Engine; @@ -28,7 +28,6 @@ mod macros; // strat_engine is public so that integration tests can access its internals. pub mod strat_engine; -mod consts; #[allow(module_inception)] pub mod engine; mod errors; diff --git a/src/engine/sim_engine/pool.rs b/src/engine/sim_engine/pool.rs index 5e0f91ef417..47d574bbcf2 100644 --- a/src/engine/sim_engine/pool.rs +++ b/src/engine/sim_engine/pool.rs @@ -13,9 +13,8 @@ use std::vec::Vec; use uuid::Uuid; -use devicemapper::Sectors; +use devicemapper::{IEC, Sectors}; -use super::super::consts::IEC; use super::super::engine::{Filesystem, BlockDev, HasName, HasUuid, Pool}; use super::super::errors::{EngineError, EngineResult, ErrorEnum}; use super::super::structures::Table; diff --git a/src/engine/strat_engine/blockdevmgr.rs b/src/engine/strat_engine/blockdevmgr.rs index fe21c55313c..da40a676c02 100644 --- a/src/engine/strat_engine/blockdevmgr.rs +++ b/src/engine/strat_engine/blockdevmgr.rs @@ -12,9 +12,8 @@ use chrono::{DateTime, Duration, Utc}; use rand::{thread_rng, sample}; use uuid::Uuid; -use devicemapper::{Bytes, Device, Sectors, Segment}; +use devicemapper::{Bytes, Device, IEC, Sectors, Segment}; -use super::super::consts::IEC; use super::super::engine::BlockDev; use super::super::errors::{EngineError, EngineResult, ErrorEnum}; use super::super::types::{DevUuid, PoolUuid}; diff --git a/src/engine/strat_engine/device.rs b/src/engine/strat_engine/device.rs index 59ff1fdd130..4bd4d2b9468 100644 --- a/src/engine/strat_engine/device.rs +++ b/src/engine/strat_engine/device.rs @@ -14,10 +14,8 @@ use std::path::Path; use nix::sys::stat::{S_IFBLK, S_IFMT}; -use devicemapper::consts::SECTOR_SIZE; -use devicemapper::{Bytes, Device, Sectors}; +use devicemapper::{Bytes, Device, IEC, SECTOR_SIZE, Sectors}; -use super::super::consts::IEC; use super::super::errors::{EngineResult, EngineError, ErrorEnum}; ioctl!(read blkgetsize64 with 0x12, 114; u64); diff --git a/src/engine/strat_engine/filesystem.rs b/src/engine/strat_engine/filesystem.rs index 402895d6a35..3770b4d2d91 100644 --- a/src/engine/strat_engine/filesystem.rs +++ b/src/engine/strat_engine/filesystem.rs @@ -5,8 +5,8 @@ use std::path::{Path, PathBuf}; use std::process::Command; -use devicemapper::{Bytes, DmDevice, DM, Sectors, ThinDev, ThinDevId, ThinStatus, ThinPoolDev}; -use devicemapper::consts::{IEC, SECTOR_SIZE}; +use devicemapper::{Bytes, DmDevice, DM, IEC, SECTOR_SIZE, Sectors, ThinDev, ThinDevId, ThinStatus, + ThinPoolDev}; use nix::sys::statvfs::statvfs; use nix::sys::statvfs::vfs::Statvfs; diff --git a/src/engine/strat_engine/metadata.rs b/src/engine/strat_engine/metadata.rs index c87ca19f703..fff7e72d5ce 100644 --- a/src/engine/strat_engine/metadata.rs +++ b/src/engine/strat_engine/metadata.rs @@ -10,10 +10,8 @@ use chrono::{DateTime, Utc}; use crc::crc32; use uuid::Uuid; -use devicemapper::{Bytes, Sectors}; -use devicemapper::consts::SECTOR_SIZE; +use devicemapper::{Bytes, IEC, SECTOR_SIZE, Sectors}; -use super::super::consts::IEC; use super::super::errors::{EngineResult, EngineError, ErrorEnum}; use super::super::types::{DevUuid, PoolUuid}; @@ -752,12 +750,10 @@ mod mda { mod tests { use std::io::Cursor; - use devicemapper::{Bytes, Sectors}; + use devicemapper::{Bytes, IEC, Sectors}; use quickcheck::{QuickCheck, TestResult}; use uuid::Uuid; - use super::super::super::consts::IEC; - use super::super::engine::DevOwnership; use super::*; diff --git a/src/engine/strat_engine/thinpool.rs b/src/engine/strat_engine/thinpool.rs index d8764eb7f7c..13591b5a947 100644 --- a/src/engine/strat_engine/thinpool.rs +++ b/src/engine/strat_engine/thinpool.rs @@ -10,11 +10,10 @@ use std::process::Command; use uuid::Uuid; use devicemapper as dm; -use devicemapper::{DM, DataBlocks, DmDevice, DmError, LinearDev, MetaBlocks, Sectors, Segment, - ThinDev, ThinDevId, ThinPoolDev, ThinPoolWorkingStatus}; +use devicemapper::{DM, DataBlocks, DmDevice, DmError, IEC, LinearDev, MetaBlocks, Sectors, + Segment, ThinDev, ThinDevId, ThinPoolDev, ThinPoolWorkingStatus}; use devicemapper::ErrorEnum::CheckFailed; -use super::super::consts::IEC; use super::super::engine::{Filesystem, HasName}; use super::super::errors::{EngineError, EngineResult, ErrorEnum}; use super::super::structures::Table; diff --git a/tests/util/blockdev_tests.rs b/tests/util/blockdev_tests.rs index 92cff3a7e72..dcfd6a5cfcd 100644 --- a/tests/util/blockdev_tests.rs +++ b/tests/util/blockdev_tests.rs @@ -15,8 +15,7 @@ use std::path::Path; use self::uuid::Uuid; -use self::devicemapper::Sectors; -use self::devicemapper::consts::SECTOR_SIZE; +use self::devicemapper::{SECTOR_SIZE, Sectors}; use libstratis::engine::Engine; use libstratis::engine::strat_engine::blockdevmgr::{BlockDevMgr, initialize}; diff --git a/tests/util/dm_tests.rs b/tests/util/dm_tests.rs index fcaf3fa781c..e4d12f5faba 100644 --- a/tests/util/dm_tests.rs +++ b/tests/util/dm_tests.rs @@ -19,13 +19,8 @@ use self::nix::mount::{MsFlags, MNT_DETACH, mount, umount2}; use self::tempdir::TempDir; use self::uuid::Uuid; -use self::devicemapper::Bytes; -use self::devicemapper::consts::IEC; -use self::devicemapper::{DmName, DM}; -use self::devicemapper::LinearDev; -use self::devicemapper::Segment; -use self::devicemapper::{DataBlocks, Sectors}; -use self::devicemapper::{DmDevice, ThinDev, ThinDevId, ThinPoolDev}; +use self::devicemapper::{Bytes, DM, DataBlocks, DmDevice, DmName, IEC, LinearDev, Sectors, + Segment, ThinDev, ThinDevId, ThinPoolDev}; use libstratis::engine::strat_engine::blockdevmgr::{BlockDevMgr, initialize, map_to_dm}; use libstratis::engine::strat_engine::device::{blkdev_size, resolve_devices, wipe_sectors}; diff --git a/tests/util/filesystem_tests.rs b/tests/util/filesystem_tests.rs index dec6e19a63d..d41817dcf4b 100644 --- a/tests/util/filesystem_tests.rs +++ b/tests/util/filesystem_tests.rs @@ -17,9 +17,7 @@ use self::nix::mount::{MsFlags, mount, umount}; use self::tempdir::TempDir; -use self::devicemapper::consts::IEC; -use self::devicemapper::{Bytes, DM}; -use self::devicemapper::consts::SECTOR_SIZE; +use self::devicemapper::{Bytes, DM, IEC, SECTOR_SIZE}; use libstratis::engine::Pool; use libstratis::engine::Filesystem; diff --git a/tests/util/pool_tests.rs b/tests/util/pool_tests.rs index c5eb57f7cb8..b105cc06fc2 100644 --- a/tests/util/pool_tests.rs +++ b/tests/util/pool_tests.rs @@ -11,10 +11,7 @@ use std::fs::OpenOptions; use std::io::Write; use std::path::{Path, PathBuf}; -use self::devicemapper::{Device, DmName, DM}; -use self::devicemapper::Sectors; -use self::devicemapper::consts::SECTOR_SIZE; -use self::devicemapper::ThinDev; +use self::devicemapper::{Device, DmName, DM, SECTOR_SIZE, Sectors, ThinDev}; use libstratis::engine::{Engine, Pool}; use libstratis::engine::engine::HasUuid;