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

Update bcachefs sources to fc21725d2621 workqueue: Basic memory allocation profiling support
Some checks failed
build / bcachefs-tools-deb (ubuntu-24.04) (push) Has been cancelled
Details
build / bcachefs-tools-rpm (push) Has been cancelled
Details
build / bcachefs-tools-msrv (push) Has been cancelled
Details
Nix Flake actions / nix-matrix (push) Has been cancelled
Details
Nix Flake actions / ${{ matrix.name }} (${{ matrix.system }}) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Kent Overstreet 2025-08-02 15:06:19 -04:00
parent 6704e252ef
commit a15e15326b
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
dca6a42b74674732d1d7683c282f6002752b2bda fc21725d2621ee19328f03e1ba734af8efe925f8

6
libbcachefs/move.c
View File

@ -344,10 +344,14 @@ int bch2_move_extent(struct moving_context *ctxt,
if (!data_opts.rewrite_ptrs && if (!data_opts.rewrite_ptrs &&
!data_opts.extra_replicas && !data_opts.extra_replicas &&
!data_opts.scrub) { !data_opts.scrub) {
if (data_opts.kill_ptrs) if (data_opts.kill_ptrs) {
this_cpu_add(c->counters[BCH_COUNTER_io_move_drop_only], k.k->size);
return bch2_extent_drop_ptrs(trans, iter, k, &io_opts, &data_opts); return bch2_extent_drop_ptrs(trans, iter, k, &io_opts, &data_opts);
} else {
this_cpu_add(c->counters[BCH_COUNTER_io_move_noop], k.k->size);
return 0; return 0;
} }
}
struct moving_io *io = allocate_dropping_locks(trans, ret, struct moving_io *io = allocate_dropping_locks(trans, ret,
kzalloc(sizeof(struct moving_io), _gfp)); kzalloc(sizeof(struct moving_io), _gfp));

2
libbcachefs/sb-counters_format.h
View File

@ -31,6 +31,8 @@ enum counters_flags {
x(io_move_fail, 38, TYPE_COUNTER) \ x(io_move_fail, 38, TYPE_COUNTER) \
x(io_move_write_fail, 82, TYPE_COUNTER) \ x(io_move_write_fail, 82, TYPE_COUNTER) \
x(io_move_start_fail, 39, TYPE_COUNTER) \ x(io_move_start_fail, 39, TYPE_COUNTER) \
x(io_move_drop_only, 91, TYPE_COUNTER) \
x(io_move_noop, 92, TYPE_COUNTER) \
x(io_move_created_rebalance, 83, TYPE_COUNTER) \ x(io_move_created_rebalance, 83, TYPE_COUNTER) \
x(io_move_evacuate_bucket, 84, TYPE_COUNTER) \ x(io_move_evacuate_bucket, 84, TYPE_COUNTER) \
x(bucket_invalidate, 3, TYPE_COUNTER) \ x(bucket_invalidate, 3, TYPE_COUNTER) \