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

refactor: rename function again

Browse Source 
`bch2_sb_is_encrypted_and_locked()` simply does not check if the fs is
locked. The name is misleading.

Signed-off-by: Thomas Mühlbacher <tmuehlbacher@posteo.net>
This commit is contained in:
Thomas Mühlbacher 2024-05-30 20:50:00 +02:00
parent 21b1111b59
commit 25bce91b4b
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
c_src/cmd_key.c
View File

@ -66,7 +66,7 @@ int cmd_unlock(int argc, char *argv[])
if (ret)
die("Error opening %s: %s", dev, bch2_err_str(ret));
if (!bch2_sb_is_encrypted_and_locked(sb.sb))
if (!bch2_sb_is_encrypted(sb.sb))
die("%s is not encrypted", dev);
if (check)

2
c_src/crypto.c
View File

@ -101,7 +101,7 @@ struct bch_key derive_passphrase(struct bch_sb_field_crypt *crypt,
return key;
}
bool bch2_sb_is_encrypted_and_locked(struct bch_sb *sb)
bool bch2_sb_is_encrypted(struct bch_sb *sb)
{
struct bch_sb_field_crypt *crypt;

2
c_src/crypto.h
View File

@ -12,7 +12,7 @@ char *read_passphrase(const char *);
char *read_passphrase_twice(const char *);
struct bch_key derive_passphrase(struct bch_sb_field_crypt *, const char *);
bool bch2_sb_is_encrypted_and_locked(struct bch_sb *);
bool bch2_sb_is_encrypted(struct bch_sb *);
void bch2_passphrase_check(struct bch_sb *, const char *,
struct bch_key *, struct bch_encrypted_key *);
void bch2_add_key(struct bch_sb *, const char *, const char *, const char *);

2
src/commands/mount.rs
View File

@ -344,7 +344,7 @@ fn cmd_mount_inner(opt: Cli) -> anyhow::Result<()> {
.unwrap();
// Check if the filesystem's master key is encrypted and we don't have a key
if unsafe { bcachefs::bch2_sb_is_encrypted_and_locked(block_devices_to_mount[0].sb) }
if unsafe { bcachefs::bch2_sb_is_encrypted(block_devices_to_mount[0].sb) }
&& !key::check_for_key(&key_name)?
{
// First by password_file, if available