[PATCH 9/9] bcachefs: Modify mismatched function name

[PATCH 9/9] bcachefs: Modify mismatched function name

[Jiapeng Chong]

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.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6584
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
 fs/bcachefs/alloc_foreground.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/bcachefs/alloc_foreground.c b/fs/bcachefs/alloc_foreground.c
index e02749ddc362..10a7979707ef 100644
--- a/fs/bcachefs/alloc_foreground.c
+++ b/fs/bcachefs/alloc_foreground.c
@@ -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
  */
-- 
2.20.1.7.g153144c

[PATCH 1/9] bcachefs: Modify mismatched function name

[Jiapeng Chong]

No functional modification involved.

fs/bcachefs/journal_reclaim.c:600: warning: expecting prototype for bch2_journal_reclaim(). Prototype was for __bch2_journal_reclaim() instead.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6576
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
 fs/bcachefs/journal_reclaim.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/bcachefs/journal_reclaim.c b/fs/bcachefs/journal_reclaim.c
index 10e1860dad79..bed94af68fd0 100644
--- a/fs/bcachefs/journal_reclaim.c
+++ b/fs/bcachefs/journal_reclaim.c
@@ -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.
-- 
2.20.1.7.g153144c

[PATCH 2/9] bcachefs: Modify mismatched function name

[Jiapeng Chong]

No functional modification involved.

fs/bcachefs/journal_io.c:1387: warning: expecting prototype for journal_next_bucket(). Prototype was for journal_write_alloc() instead.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6577
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
 fs/bcachefs/journal_io.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c
index 34740dca4b15..b4a4dd411239 100644
--- a/fs/bcachefs/journal_io.c
+++ b/fs/bcachefs/journal_io.c
@@ -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)
-- 
2.20.1.7.g153144c

[PATCH 3/9] bcachefs: Modify mismatched function name

[Jiapeng Chong]

No 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.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6578
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
 fs/bcachefs/io.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/bcachefs/io.c b/fs/bcachefs/io.c
index 3c614c864b6e..cd14a6d87e2b 100644
--- a/fs/bcachefs/io.c
+++ b/fs/bcachefs/io.c
@@ -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
-- 
2.20.1.7.g153144c

[PATCH 4/9] bcachefs: Modify mismatched function name

[Jiapeng Chong]

No 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.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6579
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
 fs/bcachefs/btree_update_interior.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c
index 73c950d2788e..29f5e6174270 100644
--- a/fs/bcachefs/btree_update_interior.c
+++ b/fs/bcachefs/btree_update_interior.c
@@ -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,
-- 
2.20.1.7.g153144c

[PATCH 5/9] bcachefs: Modify mismatched function name

[Jiapeng Chong]

No 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.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6580
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
 fs/bcachefs/btree_trans_commit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/bcachefs/btree_trans_commit.c b/fs/bcachefs/btree_trans_commit.c
index eafb0388ef82..5388bfa4d15b 100644
--- a/fs/bcachefs/btree_trans_commit.c
+++ b/fs/bcachefs/btree_trans_commit.c
@@ -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,
-- 
2.20.1.7.g153144c

[PATCH 6/9] bcachefs: Modify mismatched function name

[Jiapeng Chong]

No 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.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6581
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
 fs/bcachefs/btree_iter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
index 1dbb4d7dfb45..4151e98ce1ad 100644
--- a/fs/bcachefs/btree_iter.c
+++ b/fs/bcachefs/btree_iter.c
@@ -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)
-- 
2.20.1.7.g153144c

[PATCH 7/9] bcachefs: Modify mismatched function name

[Jiapeng Chong]

No 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.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6582
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
 fs/bcachefs/bset.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/bcachefs/bset.c b/fs/bcachefs/bset.c
index 685792137d2a..2cd3e7562934 100644
--- a/fs/bcachefs/bset.c
+++ b/fs/bcachefs/bset.c
@@ -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:
-- 
2.20.1.7.g153144c

[PATCH 8/9] bcachefs: Modify mismatched function name

[Jiapeng Chong]

No 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.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6583
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
 fs/bcachefs/btree_cache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/bcachefs/btree_cache.c b/fs/bcachefs/btree_cache.c
index d8cd0bbc33cc..661d26da3819 100644
--- a/fs/bcachefs/btree_cache.c
+++ b/fs/bcachefs/btree_cache.c
@@ -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
-- 
2.20.1.7.g153144c

Re: [PATCH 9/9] bcachefs: Modify mismatched function name

[Brian Foster]

On Thu, Sep 14, 2023 at 05:04:49PM +0800, Jiapeng Chong wrote:
> 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.
> 
> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6584
> Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
> ---

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

>  fs/bcachefs/alloc_foreground.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/bcachefs/alloc_foreground.c b/fs/bcachefs/alloc_foreground.c
> index e02749ddc362..10a7979707ef 100644
> --- a/fs/bcachefs/alloc_foreground.c
> +++ b/fs/bcachefs/alloc_foreground.c
> @@ -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
>   */
> -- 
> 2.20.1.7.g153144c
> 

Re: [PATCH 9/9] bcachefs: Modify mismatched function name

[Kent Overstreet]

On Thu, Sep 14, 2023 at 05:04:49PM +0800, Jiapeng Chong wrote:
> 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.

I've already fixed all of these.