2023-09-14 18:11:21

by Jiapeng Chong

[permalink] [raw]
Subject: [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.

Reported-by: Abaci Robot <[email protected]>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6584
Signed-off-by: Jiapeng Chong <[email protected]>
---
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


2023-09-14 18:11:49

by Jiapeng Chong

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

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 <[email protected]>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6581
Signed-off-by: Jiapeng Chong <[email protected]>
---
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

2023-09-14 18:11:52

by Jiapeng Chong

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

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 <[email protected]>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6577
Signed-off-by: Jiapeng Chong <[email protected]>
---
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

2023-09-14 22:25:51

by Brian Foster

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

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 <[email protected]>
> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6584
> 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

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

2023-09-15 01:08:18

by Kent Overstreet

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

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.