From 9ec185437d4ffb25e636df4b83cdce01ae08aa7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= Date: Fri, 31 May 2024 03:54:35 +0200 Subject: [PATCH] fix: evaluate KeyHandle Result MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This one is sort of bad to have missed, ouch. Signed-off-by: Thomas Mühlbacher --- src/commands/mount.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/commands/mount.rs b/src/commands/mount.rs index 622f6cb9..f6c845f3 100644 --- a/src/commands/mount.rs +++ b/src/commands/mount.rs @@ -343,7 +343,7 @@ fn cmd_mount_inner(opt: Cli) -> Result<()> { let uuid = first_sb.sb().uuid(); if unsafe { bcachefs::bch2_sb_is_encrypted(first_sb.sb) } { - let _key_handle = KeyHandle::new_from_search(&uuid).or_else(|_| { + let _key_handle: KeyHandle = KeyHandle::new_from_search(&uuid).or_else(|_| { opt.passphrase_file .and_then(|path| match Passphrase::new_from_file(&first_sb, path) { Ok(p) => Some(KeyHandle::new(&first_sb, &p)), @@ -356,7 +356,7 @@ fn cmd_mount_inner(opt: Cli) -> Result<()> { } }) .unwrap_or_else(|| opt.unlock_policy.apply(&first_sb)) - }); + })?; } if let Some(mountpoint) = opt.mountpoint {