Move SECTOR_SIZE into core

It is there that it is used.

Signed-off-by: mulhern <amulhern@redhat.com>

Author: mulkieran

src/consts.rs

@@ -2,9 +2,6 @@
 // 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/.
 
-/// disk sector size in bytes
-pub const SECTOR_SIZE: usize = 512;
-
 #[allow(non_upper_case_globals)]
 #[allow(non_snake_case)]
 /// International Electrotechnical Commission Units Standards

src/core/mod.rs

@@ -21,5 +21,5 @@ pub use self::dm_flags::{DmCookie, DmFlags};
 pub use self::dm_options::DmOptions;
 pub use self::types::{
     Bytes, DataBlocks, DevId, DmName, DmNameBuf, DmUuid, DmUuidBuf, MetaBlocks, Sectors,
-    TargetType, TargetTypeBuf,
+    TargetType, TargetTypeBuf, SECTOR_SIZE,
 };

src/core/types.rs

@@ -9,12 +9,14 @@ use std::ops::{Add, Deref, Div, Mul, Rem};
 
 use serde;
 
-use crate::consts::SECTOR_SIZE;
 use crate::result::{DmError, DmResult};
 
 use crate::core::deviceinfo::{DM_NAME_LEN, DM_UUID_LEN};
 use crate::core::errors::ErrorKind;
 
+/// disk sector size in bytes
+pub const SECTOR_SIZE: usize = 512;
+
 /// a kernel defined block size constant for any DM meta device
 /// a DM meta device may store cache device or thinpool device metadata
 /// defined in drivers/md/persistent-data/dm-space-map-metadata.h as

src/lib.rs

@@ -128,10 +128,10 @@ pub use crate::cachedev::{
     CacheDev, CacheDevPerformance, CacheDevStatus, CacheDevUsage, CacheDevWorkingStatus,
     MAX_CACHE_BLOCK_SIZE, MIN_CACHE_BLOCK_SIZE,
 };
-pub use crate::consts::{IEC, SECTOR_SIZE};
+pub use crate::consts::IEC;
 pub use crate::core::{
     devnode_to_devno, Bytes, DataBlocks, DevId, Device, DmCookie, DmFlags, DmName, DmNameBuf,
-    DmOptions, DmUuid, DmUuidBuf, MetaBlocks, Sectors, TargetType, TargetTypeBuf, DM,
+    DmOptions, DmUuid, DmUuidBuf, MetaBlocks, Sectors, TargetType, TargetTypeBuf, DM, SECTOR_SIZE,
 };
 pub use crate::lineardev::{
     FlakeyTargetParams, LinearDev, LinearDevTargetParams, LinearDevTargetTable, LinearTargetParams,

src/loopbacked.rs

@@ -12,8 +12,8 @@ use loopdev::{LoopControl, LoopDevice};
 use nix;
 use tempfile::{self, TempDir};
 
-use crate::consts::{IEC, SECTOR_SIZE};
-use crate::core::{Bytes, Sectors};
+use crate::consts::IEC;
+use crate::core::{Bytes, Sectors, SECTOR_SIZE};
 use crate::test_lib::clean_up;
 
 /// send IOCTL via blkgetsize64