cmd_set_passphrase: revoke the invalidated key

[bcachefs-tools-debian] / libbcachefs / sysfs.c

diff --git a/libbcachefs/sysfs.c b/libbcachefs/sysfs.c
index 0be70bf1cd1663a8c04d15aa2a92cb7914a01f68..941f4bcb997e7ea00fb851f4cb68663606e586dd 100644 (file)
--- a/libbcachefs/sysfs.c
+++ b/libbcachefs/sysfs.c
@@ -202,7 +202,7 @@ read_attribute(nocow_lock_table);
 #ifdef BCH_WRITE_REF_DEBUG
 read_attribute(write_refs);
 
-const char * const bch2_write_refs[] = {
+static const char * const bch2_write_refs[] = {
 #define x(n)   #n,
        BCH_WRITE_REFS()
 #undef x
@@ -248,7 +248,6 @@ read_attribute(new_stripes);
 read_attribute(io_timers_read);
 read_attribute(io_timers_write);
 
-read_attribute(data_jobs);
 read_attribute(moving_ctxts);
 
 #ifdef CONFIG_BCACHEFS_TESTS
@@ -379,7 +378,7 @@ static void bch2_btree_wakeup_all(struct bch_fs *c)
 {
        struct btree_trans *trans;
 
-       mutex_lock(&c->btree_trans_lock);
+       seqmutex_lock(&c->btree_trans_lock);
        list_for_each_entry(trans, &c->btree_trans_list, list) {
                struct btree_bkey_cached_common *b = READ_ONCE(trans->locking);
 
@@ -387,7 +386,7 @@ static void bch2_btree_wakeup_all(struct bch_fs *c)
                        six_lock_wakeup_all(&b->lock);
 
        }
-       mutex_unlock(&c->btree_trans_lock);
+       seqmutex_unlock(&c->btree_trans_lock);
 }
 
 SHOW(bch2_fs)
@@ -458,9 +457,6 @@ SHOW(bch2_fs)
        if (attr == &sysfs_io_timers_write)
                bch2_io_timers_to_text(out, &c->io_clock[WRITE]);
 
-       if (attr == &sysfs_data_jobs)
-               bch2_data_jobs_to_text(out, c);
-
        if (attr == &sysfs_moving_ctxts)
                bch2_fs_moving_ctxts_to_text(out, c);
 
@@ -681,7 +677,6 @@ struct attribute *bch2_fs_internal_files[] = {
        &sysfs_rebalance_work,
        sysfs_pd_controller_files(rebalance),
 
-       &sysfs_data_jobs,
        &sysfs_moving_ctxts,
 
        &sysfs_internal_uuid,
@@ -850,8 +845,8 @@ static void dev_alloc_debug_to_text(struct printbuf *out, struct bch_dev *ca)
 
        prt_printf(out, "reserves:");
        prt_newline(out);
-       for (i = 0; i < RESERVE_NR; i++) {
-               prt_str(out, bch2_alloc_reserves[i]);
+       for (i = 0; i < BCH_WATERMARK_NR; i++) {
+               prt_str(out, bch2_watermarks[i]);
                prt_tab(out);
                prt_u64(out, bch2_dev_buckets_reserved(ca, i));
                prt_tab_rjust(out);