bcachefs: Modify mismatched function name
PATCH 9/9 bcachefs: Modify mismatched function name
No functional modification involved.
fs/bcachefs/alloc_foreground.c:514: warning: expecting prototype for bch_bucket_alloc(). Prototype was for bch2_bucket_alloc_trans() instead.
--- fs/bcachefs/alloc_foreground.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/bcachefs/alloc_foreground.c +1 -1
@@ -502,7 +502,7 @@ static struct open_bucket *bch2_bucket_alloc_freelist(struct btree_trans *trans, }/** -* bch_bucket_alloc - allocate a single bucket from a specific device +* bch2_bucket_alloc_trans - allocate a single bucket from a specific device * * Returns index of bucket on success, 0 on failure */
Signature · 1 line
2.20.1.7.g153144c
PATCH 1/9 bcachefs: Modify mismatched function name
No functional modification involved.
fs/bcachefs/journal_reclaim.c:600: warning: expecting prototype for bch2_journal_reclaim(). Prototype was for __bch2_journal_reclaim() instead.
--- fs/bcachefs/journal_reclaim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/bcachefs/journal_reclaim.c +1 -1
@@ -579,7 +579,7 @@ static u64 journal_seq_to_flush(struct journal *j) }/** -* bch2_journal_reclaim - free up journal buckets +* __bch2_journal_reclaim - free up journal buckets * * Background journal reclaim writes out btree nodes. It should be run * early enough so that we never completely run out of journal buckets.
Signature · 1 line
2.20.1.7.g153144c
PATCH 2/9 bcachefs: Modify mismatched function name
In reply to Jiapeng ChongNo functional modification involved.
fs/bcachefs/journal_io.c:1387: warning: expecting prototype for journal_next_bucket(). Prototype was for journal_write_alloc() instead.
--- fs/bcachefs/journal_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/bcachefs/journal_io.c +1 -1
@@ -1380,7 +1380,7 @@ static void __journal_write_alloc(struct journal *j, }/** -* journal_next_bucket - move on to the next journal bucket if possible +* journal_write_alloc - move on to the next journal bucket if possible */ static int journal_write_alloc (struct journal *j,struct journal_buf *w,unsigned sectors)
Signature · 1 line
2.20.1.7.g153144c
PATCH 3/9 bcachefs: Modify mismatched function name
In reply to Jiapeng ChongNo functional modification involved.
fs/bcachefs/io.c:1817: warning: expecting prototype for bch_write(). Prototype was for bch2_write() instead. fs/bcachefs/io.c:747: warning: expecting prototype for bch_write_index(). Prototype was for __bch2_write_index() instead.
--- fs/bcachefs/io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/bcachefs/io.c +2 -2
@@ -741,7 +741,7 @@ static noinline int bch2_write_drop_io_error_ptrs(struct bch_write_op *op) }/** -* bch_write_index - after a write, update index to point to new data +* __bch2_write_index - after a write, update index to point to new data */ static void __bch2_write_index (struct bch_write_op *op) {
@@ -1798,7 +1798,7 @@ static void bch2_write_data_inline(struct bch_write_op *op, unsigned data_len) }/** -* bch_write - handle a write to a cache device or flash only volume +* bch2_write - handle a write to a cache device or flash only volume * * This is the starting point for any data to end up in a cache device; it could * be from a normal write, or a writeback write, or a write to a flash only
Signature · 1 line
2.20.1.7.g153144c
PATCH 4/9 bcachefs: Modify mismatched function name
In reply to Jiapeng ChongNo functional modification involved.
fs/bcachefs/btree_update_interior.c:153: warning: expecting prototype for btree_node_format_fits(). Prototype was for bch2_btree_node_format_fits() instead. fs/bcachefs/btree_update_interior.c:1235: warning: expecting prototype for bch_btree_set_root(). Prototype was for bch2_btree_set_root() instead. fs/bcachefs/btree_update_interior.c:1678: warning: expecting prototype for bch_btree_insert_node(). Prototype was for bch2_btree_insert_node() instead. fs/bcachefs/btree_update_interior.c:1944: warning: expecting prototype for bch_btree_node_rewrite(). Prototype was for bch2_btree_node_rewrite() instead.
--- fs/bcachefs/btree_update_interior.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fs/bcachefs/btree_update_interior.c +4 -4
@@ -143,7 +143,7 @@ static size_t btree_node_u64s_with_format(struct btree *b, }/** -* btree_node_format_fits - check if we could rewrite node with a new format +* bch2_btree_node_format_fits - check if we could rewrite node with a new format * * This assumes all keys can pack with the new format -- it just checks if * the re-packed keys would fit inside the node itself.
@@ -1217,7 +1217,7 @@ static void bch2_btree_set_root_inmem(struct bch_fs *c, struct btree *b) }/** -* bch_btree_set_root - update the root in memory and on disk +* bch2_btree_set_root - update the root in memory and on disk * * To ensure forward progress, the current task must not be holding any * btree node write locks. However, you must hold an intent lock on the
@@ -1661,7 +1661,7 @@ bch2_btree_insert_keys_interior(struct btree_update *as, }/** -* bch_btree_insert_node - insert bkeys into a given btree node +* bch2_btree_insert_node - insert bkeys into a given btree node * * @iter: btree iterator * @keys: list of keys to insert
@@ -1935,7 +1935,7 @@ int __bch2_foreground_maybe_merge(struct btree_trans *trans, }/** -* bch_btree_node_rewrite - Rewrite/move a btree node +* bch2_btree_node_rewrite - Rewrite/move a btree node */ int bch2_btree_node_rewrite(struct btree_trans *trans, struct btree_iter *iter,
Signature · 1 line
2.20.1.7.g153144c
PATCH 5/9 bcachefs: Modify mismatched function name
In reply to Jiapeng ChongNo functional modification involved.
fs/bcachefs/btree_trans_commit.c:223: warning: expecting prototype for btree_insert_key(). Prototype was for bch2_btree_insert_key_leaf() instead.
--- fs/bcachefs/btree_trans_commit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/bcachefs/btree_trans_commit.c +1 -1
@@ -214,7 +214,7 @@ inline void bch2_btree_add_journal_pin(struct bch_fs *c, }/** -* btree_insert_key - insert a key one key into a leaf node +* bch2_btree_insert_key_leaf - insert a key one key into a leaf node */ inline void bch2_btree_insert_key_leaf(struct btree_trans *trans, struct btree_path *path,
Signature · 1 line
2.20.1.7.g153144c
PATCH 6/9 bcachefs: Modify mismatched function name
In reply to Jiapeng ChongNo functional modification involved.
fs/bcachefs/btree_iter.c:2055: warning: expecting prototype for bch2_btree_iter_peek(). Prototype was for bch2_btree_iter_peek_upto() instead.
--- fs/bcachefs/btree_iter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/bcachefs/btree_iter.c +1 -1
@@ -2048,7 +2048,7 @@ static struct bkey_s_c __bch2_btree_iter_peek(struct btree_iter *iter, struct bp }/** -* bch2_btree_iter_peek: returns first key greater than or equal to iterator's +* bch2_btree_iter_peek_upto: returns first key greater than or equal to iterator's * current position */ struct bkey_s_c bch2_btree_iter_peek_upto (struct btree_iter *iter,struct bpos end)
Signature · 1 line
2.20.1.7.g153144c
PATCH 7/9 bcachefs: Modify mismatched function name
In reply to Jiapeng ChongNo functional modification involved.
fs/bcachefs/bset.c:1314: warning: expecting prototype for bch_btree_node_iter_init(). Prototype was for bch2_btree_node_iter_init() instead.
--- fs/bcachefs/bset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/bcachefs/bset.c +1 -1
@@ -1269,7 +1269,7 @@ static void btree_node_iter_init_pack_failed(struct btree_node_iter *iter, }/** -* bch_btree_node_iter_init - initialize a btree node iterator, starting from a +* bch2_btree_node_iter_init - initialize a btree node iterator, starting from a * given position * * Main entry point to the lookup code for individual btree nodes:
Signature · 1 line
2.20.1.7.g153144c
PATCH 8/9 bcachefs: Modify mismatched function name
In reply to Jiapeng ChongNo functional modification involved.
fs/bcachefs/btree_cache.c:932: warning: expecting prototype for bch_btree_node_get(). Prototype was for bch2_btree_node_get() instead.
--- fs/bcachefs/btree_cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/bcachefs/btree_cache.c +1 -1
@@ -918,7 +918,7 @@ static struct btree *__bch2_btree_node_get(struct btree_trans *trans, struct btr }/** -* bch_btree_node_get - find a btree node in the cache and lock it, reading it +* bch2_btree_node_get - find a btree node in the cache and lock it, reading it * in from disk if necessary. * * The btree node will have either a read or a write lock held, depending on
Signature · 1 line
2.20.1.7.g153144c
Quoted 8 lines · Jiapeng Chong
No functional modification involved.
fs/bcachefs/alloc_foreground.c:514: warning: expecting prototype forbch_bucket_alloc(). Prototype was forbch2_bucket_alloc_trans()instead.Reported-by Abaci Robot <[email protected]>Signed-off-by Jiapeng Chong <[email protected]>---
JFYI, it seems like the patch series is oddly threaded with patch 9/9 being the "cover letter..?"
Also, what's the granularity of the patches here? Per robot filed bug? Per source file? I don't think it really matters for this particular series, though personally I would probably squash these down into one upon merge (and prefer to see any further patches of this nature similarly condensed).
Brian
Quoted 19 lines
fs/bcachefs/alloc_foreground.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/bcachefs/alloc_foreground.c +1
-1@@ -502,7 +502,7 @@ static struct open_bucket *bch2_bucket_alloc_freelist(struct btree_trans *trans, }/** -* bch_bucket_alloc - allocate a single bucket from a specific device +* bch2_bucket_alloc_trans - allocate a single bucket from a specific device * * Returns index of bucket on success, 0 on failure */ Signature · 1 line
2.20.1.7.g153144c
Quoted 3 lines · Jiapeng Chong
No functional modification involved.
fs/bcachefs/alloc_foreground.c:514: warning: expecting prototype forbch_bucket_alloc(). Prototype was forbch2_bucket_alloc_trans()instead.
I've already fixed all of these.