diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-11-03 03:36:00 +0300 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-01-01 19:47:39 +0300 |
| commit | cb13f471390ce646a3d5aa9c599f7eec43ddb2ac (patch) | |
| tree | e87b58b4262077646b4bfd5f8a83aaeed74f4ed9 /fs/bcachefs | |
| parent | d3083cf28d54991c299d5c05790e40e52cf75df0 (diff) | |
| download | linux-cb13f471390ce646a3d5aa9c599f7eec43ddb2ac.tar.xz | |
bcachefs: bch2_btree_write_buffer_flush() -> bch2_btree_write_buffer_tryflush()
More accurate naming.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs')
| -rw-r--r-- | fs/bcachefs/alloc_background.c | 2 | ||||
| -rw-r--r-- | fs/bcachefs/btree_write_buffer.c | 2 | ||||
| -rw-r--r-- | fs/bcachefs/btree_write_buffer.h | 2 | ||||
| -rw-r--r-- | fs/bcachefs/move.c | 7 | ||||
| -rw-r--r-- | fs/bcachefs/movinggc.c | 4 |
5 files changed, 8 insertions, 9 deletions
diff --git a/fs/bcachefs/alloc_background.c b/fs/bcachefs/alloc_background.c index fc8555df89c8..ccc3779dd366 100644 --- a/fs/bcachefs/alloc_background.c +++ b/fs/bcachefs/alloc_background.c @@ -1817,7 +1817,7 @@ static void bch2_do_invalidates_work(struct work_struct *work) unsigned i; int ret = 0; - ret = bch2_btree_write_buffer_flush(trans); + ret = bch2_btree_write_buffer_tryflush(trans); if (ret) goto err; diff --git a/fs/bcachefs/btree_write_buffer.c b/fs/bcachefs/btree_write_buffer.c index 77d86db344b7..6a1915680407 100644 --- a/fs/bcachefs/btree_write_buffer.c +++ b/fs/bcachefs/btree_write_buffer.c @@ -299,7 +299,7 @@ int bch2_btree_write_buffer_flush_nocheck_rw(struct btree_trans *trans) return ret; } -int bch2_btree_write_buffer_flush(struct btree_trans *trans) +int bch2_btree_write_buffer_tryflush(struct btree_trans *trans) { struct bch_fs *c = trans->c; diff --git a/fs/bcachefs/btree_write_buffer.h b/fs/bcachefs/btree_write_buffer.h index 1705b36d5875..dec2c9a8bab2 100644 --- a/fs/bcachefs/btree_write_buffer.h +++ b/fs/bcachefs/btree_write_buffer.h @@ -5,7 +5,7 @@ int bch2_btree_write_buffer_flush_locked(struct btree_trans *); int bch2_btree_write_buffer_flush_nocheck_rw(struct btree_trans *); int bch2_btree_write_buffer_flush_sync(struct btree_trans *); -int bch2_btree_write_buffer_flush(struct btree_trans *); +int bch2_btree_write_buffer_tryflush(struct btree_trans *); int bch2_btree_insert_keys_write_buffer(struct btree_trans *); diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c index 615f18a0311a..eafa80c18ba4 100644 --- a/fs/bcachefs/move.c +++ b/fs/bcachefs/move.c @@ -681,11 +681,10 @@ int __bch2_evacuate_bucket(struct moving_context *ctxt, bucket_size = bch_dev_bkey_exists(c, bucket.inode)->mi.bucket_size; fragmentation = a->fragmentation_lru; - ret = bch2_btree_write_buffer_flush(trans); - if (ret) { - bch_err_msg(c, ret, "flushing btree write buffer"); + ret = bch2_btree_write_buffer_tryflush(trans); + bch_err_msg(c, ret, "flushing btree write buffer"); + if (ret) goto err; - } while (!(ret = bch2_move_ratelimit(ctxt))) { if (is_kthread && kthread_should_stop()) diff --git a/fs/bcachefs/movinggc.c b/fs/bcachefs/movinggc.c index ba3a323a4843..7cffcf6cfa64 100644 --- a/fs/bcachefs/movinggc.c +++ b/fs/bcachefs/movinggc.c @@ -153,11 +153,11 @@ static int bch2_copygc_get_buckets(struct moving_context *ctxt, move_buckets_wait(ctxt, buckets_in_flight, false); - ret = bch2_btree_write_buffer_flush(trans); + ret = bch2_btree_write_buffer_tryflush(trans); if (bch2_err_matches(ret, EROFS)) return ret; - if (bch2_fs_fatal_err_on(ret, c, "%s: error %s from bch2_btree_write_buffer_flush()", + if (bch2_fs_fatal_err_on(ret, c, "%s: error %s from bch2_btree_write_buffer_tryflush()", __func__, bch2_err_str(ret))) return ret; |