2023-09-14 09:20:47

by Jiapeng Chong

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

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