Update bcachefs sources to 95ff72a6c1 fixup! mm: Centralize & improve oom reporting...

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

diff --git a/libbcachefs/sysfs.c b/libbcachefs/sysfs.c
index d72ec0629a376b24f22deeb7e66b58969b0f72fe..2c650055f53064e24f7b48c8cd1e64c4e856bf8c 100644 (file)
--- a/libbcachefs/sysfs.c
+++ b/libbcachefs/sysfs.c
@@ -182,7 +182,6 @@ read_attribute(journal_debug);
 read_attribute(btree_updates);
 read_attribute(btree_cache);
 read_attribute(btree_key_cache);
-read_attribute(btree_transactions);
 read_attribute(stripes_heap);
 read_attribute(open_buckets);
 
@@ -420,9 +419,6 @@ SHOW(bch2_fs)
        if (attr == &sysfs_btree_key_cache)
                bch2_btree_key_cache_to_text(out, &c->btree_key_cache);
 
-       if (attr == &sysfs_btree_transactions)
-               bch2_btree_trans_to_text(out, c);
-
        if (attr == &sysfs_stripes_heap)
                bch2_stripes_heap_to_text(out, c);
 
@@ -617,7 +613,6 @@ struct attribute *bch2_fs_internal_files[] = {
        &sysfs_btree_updates,
        &sysfs_btree_cache,
        &sysfs_btree_key_cache,
-       &sysfs_btree_transactions,
        &sysfs_new_stripes,
        &sysfs_stripes_heap,
        &sysfs_open_buckets,
@@ -676,7 +671,7 @@ STORE(bch2_fs_opts_dir)
         * We don't need to take c->writes for correctness, but it eliminates an
         * unsightly error message in the dmesg log when we're RO:
         */
-       if (unlikely(!percpu_ref_tryget(&c->writes)))
+       if (unlikely(!percpu_ref_tryget_live(&c->writes)))
                return -EROFS;
 
        tmp = kstrdup(buf, GFP_KERNEL);