Commit cb13f471 authored by Kent Overstreet's avatar Kent Overstreet

bcachefs: bch2_btree_write_buffer_flush() -> bch2_btree_write_buffer_tryflush()

More accurate naming.
Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent d3083cf2
...@@ -1817,7 +1817,7 @@ static void bch2_do_invalidates_work(struct work_struct *work) ...@@ -1817,7 +1817,7 @@ static void bch2_do_invalidates_work(struct work_struct *work)
unsigned i; unsigned i;
int ret = 0; int ret = 0;
ret = bch2_btree_write_buffer_flush(trans); ret = bch2_btree_write_buffer_tryflush(trans);
if (ret) if (ret)
goto err; goto err;
......
...@@ -299,7 +299,7 @@ int bch2_btree_write_buffer_flush_nocheck_rw(struct btree_trans *trans) ...@@ -299,7 +299,7 @@ int bch2_btree_write_buffer_flush_nocheck_rw(struct btree_trans *trans)
return ret; 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; struct bch_fs *c = trans->c;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
int bch2_btree_write_buffer_flush_locked(struct btree_trans *); 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_nocheck_rw(struct btree_trans *);
int bch2_btree_write_buffer_flush_sync(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 *); int bch2_btree_insert_keys_write_buffer(struct btree_trans *);
......
...@@ -681,11 +681,10 @@ int __bch2_evacuate_bucket(struct moving_context *ctxt, ...@@ -681,11 +681,10 @@ int __bch2_evacuate_bucket(struct moving_context *ctxt,
bucket_size = bch_dev_bkey_exists(c, bucket.inode)->mi.bucket_size; bucket_size = bch_dev_bkey_exists(c, bucket.inode)->mi.bucket_size;
fragmentation = a->fragmentation_lru; fragmentation = a->fragmentation_lru;
ret = bch2_btree_write_buffer_flush(trans); ret = bch2_btree_write_buffer_tryflush(trans);
if (ret) { bch_err_msg(c, ret, "flushing btree write buffer");
bch_err_msg(c, ret, "flushing btree write buffer"); if (ret)
goto err; goto err;
}
while (!(ret = bch2_move_ratelimit(ctxt))) { while (!(ret = bch2_move_ratelimit(ctxt))) {
if (is_kthread && kthread_should_stop()) if (is_kthread && kthread_should_stop())
......
...@@ -153,11 +153,11 @@ static int bch2_copygc_get_buckets(struct moving_context *ctxt, ...@@ -153,11 +153,11 @@ static int bch2_copygc_get_buckets(struct moving_context *ctxt,
move_buckets_wait(ctxt, buckets_in_flight, false); 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)) if (bch2_err_matches(ret, EROFS))
return ret; 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))) __func__, bch2_err_str(ret)))
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment