alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-24 00:00:19 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: avoid addr_of if we already use a reference

Browse Source 
It's kind of stupid to use this macro if we have to deref the parameter
first. I was too enthusiastic about using this macro instead of `as`
because it's nicer to read (imo).

Signed-off-by: Thomas Mühlbacher <tmuehlbacher@posteo.net>
This commit is contained in:
Thomas Mühlbacher 2024-06-03 17:02:27 +02:00
parent fac7cce224
commit 30e16b5e15
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/key.rs
View File

@ -11,7 +11,7 @@ use std::{
use anyhow::{anyhow, ensure, Result}; use anyhow::{anyhow, ensure, Result};
use bch_bindgen::{ use bch_bindgen::{
bcachefs::{self, bch_key, bch_sb_handle}, bcachefs::{self, bch_key, bch_sb_handle},
c::bch2_chacha_encrypt_key, c::{bch2_chacha_encrypt_key, bch_sb_field_crypt},
keyutils::{self, keyctl_search}, keyutils::{self, keyctl_search},
}; };
use byteorder::{LittleEndian, ReadBytesExt}; use byteorder::{LittleEndian, ReadBytesExt};
@ -66,7 +66,7 @@ impl KeyHandle {
let bch_key_magic = BCH_KEY_MAGIC.as_bytes().read_u64::<LittleEndian>().unwrap(); let bch_key_magic = BCH_KEY_MAGIC.as_bytes().read_u64::<LittleEndian>().unwrap();
let crypt = sb.sb().crypt().unwrap(); let crypt = sb.sb().crypt().unwrap();
let crypt_ptr = ptr::addr_of!(*crypt).cast_mut(); let crypt_ptr = (crypt as *const bch_sb_field_crypt).cast_mut();
let mut output: bch_key = let mut output: bch_key =
unsafe { bcachefs::derive_passphrase(crypt_ptr, passphrase.get().as_ptr()) }; unsafe { bcachefs::derive_passphrase(crypt_ptr, passphrase.get().as_ptr()) };