refactor(io-engine): use SafeMountIter instead of proc_mounts::MountIter

Ref: openebs/mayastor-dependencies#65 Signed-off-by: Niladri Halder <niladri.halder26@gmail.com>
openebs · Feb 21, 2024 · 9dee1de · 9dee1de
1 parent c6fe079
commit 9dee1de
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 28 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/io-engine-tests/Cargo.toml b/io-engine-tests/Cargo.toml
@@ -33,7 +33,6 @@ nix = "0.27.1"
 once_cell = "1.18.0"
 parking_lot = "0.12.1"
 pin-utils = "0.1.0"
-proc-mounts = "0.3.0"
 prost = "0.12.1"
 prost-derive = "0.12.1"
 rand = "0.8.5"

diff --git a/io-engine/Cargo.toml b/io-engine/Cargo.toml
@@ -73,7 +73,6 @@ nix = { version = "0.27.1", default-features = false, features = [ "hostname", "
 once_cell = "1.18.0"
 parking_lot = "0.12.1"
 pin-utils = "0.1.0"
-proc-mounts = "0.3.0"
 prost = "0.12.1"
 prost-derive = "0.12.1"
 rand = "0.8.5"
@@ -98,6 +97,7 @@ async-process = { version = "1.8.1" }
 rstack = { version = "0.3.3" }
 tokio-stream = "0.1.14"
 
+devinfo = { path = "../utils/dependencies/devinfo" }
 jsonrpc = { path = "../jsonrpc"}
 io-engine-api = { path = "../utils/dependencies/apis/io-engine" }
 spdk-rs = { path = "../spdk-rs" }

diff --git a/io-engine/src/host/blk_device.rs b/io-engine/src/host/blk_device.rs
@@ -21,14 +21,13 @@
 //!    of consistency, the mount table is also checked to ENSURE that the device
 //!    is not mounted)
 
+use crate::constants::{NEXUS_CAS_DRIVER, NVME_CONTROLLER_MODEL_ID};
+use devinfo::mountinfo::{MountInfo, SafeMountIter};
 use std::{
     collections::HashMap,
     ffi::{OsStr, OsString},
     io::Error,
 };
-
-use crate::constants::{NEXUS_CAS_DRIVER, NVME_CONTROLLER_MODEL_ID};
-use proc_mounts::{MountInfo, MountIter};
 use udev::{Device, Enumerator};
 
 // Struct representing a property value in a udev::Device struct (and possibly
@@ -278,7 +277,7 @@ fn new_device(
 fn get_mounts() -> Result<HashMap<OsString, Vec<MountInfo>>, Error> {
     let mut table: HashMap<OsString, Vec<MountInfo>> = HashMap::new();
 
-    for mount in (MountIter::new()?).flatten() {
+    for mount in SafeMountIter::get()?.flatten() {
         let mount_source = OsString::from(mount.source.clone());
         if !table.contains_key(&mount_source) {
             table.insert(mount_source.clone(), Vec::new());