diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2025-04-06 16:16:32 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2025-04-13 21:10:24 -0400 |
| commit | 844721635c1c8e7e43fb546052a659bfc92ed99d (patch) | |
| tree | 5007b56b87df050e6b5a05a3049826680705b0ed /c_src | |
| parent | ad3875d1d9907bab0430c45ffa3b2dd39107106b (diff) | |
Update bcachefs sources to 2f9361370129 bcachefs: Improve opts.degraded
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'c_src')
| -rw-r--r-- | c_src/cmd_device.c | 8 | ||||
| -rw-r--r-- | c_src/cmd_dump.c | 3 | ||||
| -rw-r--r-- | c_src/cmd_list_journal.c | 3 | ||||
| -rw-r--r-- | c_src/crypto.c | 9 |
4 files changed, 8 insertions, 15 deletions
diff --git a/c_src/cmd_device.c b/c_src/cmd_device.c index a06a3b31..1fa87a18 100644 --- a/c_src/cmd_device.c +++ b/c_src/cmd_device.c @@ -525,7 +525,7 @@ static int cmd_device_resize(int argc, char *argv[]) if (resize) die("confused: more than one online device?"); resize = ca; - percpu_ref_get(&resize->io_ref); + percpu_ref_get(&resize->io_ref[READ]); } u64 nbuckets = size / le16_to_cpu(resize->mi.bucket_size); @@ -538,7 +538,7 @@ static int cmd_device_resize(int argc, char *argv[]) if (ret) fprintf(stderr, "resize error: %s\n", bch2_err_str(ret)); - percpu_ref_put(&resize->io_ref); + percpu_ref_put(&resize->io_ref[READ]); bch2_fs_stop(c); } return 0; @@ -622,7 +622,7 @@ static int cmd_device_resize_journal(int argc, char *argv[]) if (resize) die("confused: more than one online device?"); resize = ca; - percpu_ref_get(&resize->io_ref); + percpu_ref_get(&resize->io_ref[READ]); } u64 nbuckets = size / le16_to_cpu(resize->mi.bucket_size); @@ -632,7 +632,7 @@ static int cmd_device_resize_journal(int argc, char *argv[]) if (ret) fprintf(stderr, "resize error: %s\n", bch2_err_str(ret)); - percpu_ref_put(&resize->io_ref); + percpu_ref_put(&resize->io_ref[READ]); bch2_fs_stop(c); } return 0; diff --git a/c_src/cmd_dump.c b/c_src/cmd_dump.c index 9b182325..04f099eb 100644 --- a/c_src/cmd_dump.c +++ b/c_src/cmd_dump.c @@ -116,8 +116,7 @@ int cmd_dump(int argc, char *argv[]) opt_set(opts, read_only, true); opt_set(opts, nochanges, true); opt_set(opts, norecovery, true); - opt_set(opts, degraded, true); - opt_set(opts, very_degraded, true); + opt_set(opts, degraded, BCH_DEGRADED_very); opt_set(opts, errors, BCH_ON_ERROR_continue); opt_set(opts, fix_errors, FSCK_FIX_no); diff --git a/c_src/cmd_list_journal.c b/c_src/cmd_list_journal.c index 2d364224..3cdf4846 100644 --- a/c_src/cmd_list_journal.c +++ b/c_src/cmd_list_journal.c @@ -281,8 +281,7 @@ int cmd_list_journal(int argc, char *argv[]) opt_set(opts, nochanges, true); opt_set(opts, norecovery, true); opt_set(opts, read_only, true); - opt_set(opts, degraded, true); - opt_set(opts, very_degraded, true); + opt_set(opts, degraded, BCH_DEGRADED_very); opt_set(opts, errors, BCH_ON_ERROR_continue); opt_set(opts, fix_errors, FSCK_FIX_yes); opt_set(opts, retain_recovery_info ,true); diff --git a/c_src/crypto.c b/c_src/crypto.c index 301dbebe..725bc26b 100644 --- a/c_src/crypto.c +++ b/c_src/crypto.c @@ -124,10 +124,7 @@ void bch2_passphrase_check(struct bch_sb *sb, const char *passphrase, *passphrase_key = derive_passphrase(crypt, passphrase); - /* Check if the user supplied the correct passphrase: */ - if (bch2_chacha_encrypt_key(passphrase_key, __bch2_sb_key_nonce(sb), - sb_key, sizeof(*sb_key))) - die("error encrypting key"); + bch2_chacha20(passphrase_key, __bch2_sb_key_nonce(sb), sb_key, sizeof(*sb_key)); if (bch2_key_is_encrypted(sb_key)) die("incorrect passphrase"); @@ -211,9 +208,7 @@ void bch_crypt_update_passphrase( struct bch_key passphrase_key = derive_passphrase(crypt, new_passphrase); - if (bch2_chacha_encrypt_key(&passphrase_key, __bch2_sb_key_nonce(sb), - &new_key, sizeof(new_key))) - die("error encrypting key"); + bch2_chacha20(&passphrase_key, __bch2_sb_key_nonce(sb), &new_key, sizeof(new_key)); memzero_explicit(&passphrase_key, sizeof(passphrase_key)); |