From f03a0e509e53601eb89e0466008a2c8dd025a6ee Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Fri, 5 Jun 2020 09:27:48 +0200 Subject: [PATCH] src/tools/disks.rs; use correct subdir to check holders --- src/tools/disks.rs | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/tools/disks.rs b/src/tools/disks.rs index 9ca06213..966f4946 100644 --- a/src/tools/disks.rs +++ b/src/tools/disks.rs @@ -436,17 +436,19 @@ impl Disk { /// another kernel driver like the device mapper. pub fn has_holders(&self) -> io::Result { Ok(*self - .info - .has_holders - .get_or_try_init(|| -> io::Result { - for entry in std::fs::read_dir(self.syspath())? { - match entry?.file_name().as_bytes() { - b"." | b".." => (), - _ => return Ok(true), - } - } - Ok(false) - })?) + .info + .has_holders + .get_or_try_init(|| -> io::Result { + let mut subdir = self.syspath().to_owned(); + subdir.push("holders"); + for entry in std::fs::read_dir(subdir)? { + match entry?.file_name().as_bytes() { + b"." | b".." => (), + _ => return Ok(true), + } + } + Ok(false) + })?) } /// Check if this disk is mounted.