2024-03-22 07:33:08

by Yang Li

[permalink] [raw]
Subject: [PATCH -next 2/3] fs: Add kernel-doc comments to nilfs_btree_convert_and_insert()

This commit adds kernel-doc style comments with complete parameter
descriptions for the function nilfs_btree_convert_and_insert.

Signed-off-by: Yang Li <[email protected]>
---
fs/nilfs2/btree.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c
index 65659fa0372e..de38012fd87c 100644
--- a/fs/nilfs2/btree.c
+++ b/fs/nilfs2/btree.c
@@ -1857,13 +1857,21 @@ nilfs_btree_commit_convert_and_insert(struct nilfs_bmap *btree,
}

/**
- * nilfs_btree_convert_and_insert -
- * @bmap:
- * @key:
- * @ptr:
- * @keys:
- * @ptrs:
- * @n:
+ * nilfs_btree_convert_and_insert - Convert and insert entries into a B-tree
+ * @btree: NILFS B-tree structure
+ * @key: Key of the new entry to be inserted
+ * @ptr: Pointer (block number) associated with the key to be inserted
+ * @keys: Array of keys to be inserted in addition to @key
+ * @ptrs: Array of pointers associated with @keys
+ * @n: Number of keys and pointers in @keys and @ptrs
+ *
+ * This function is used to insert a new entry specified by @key and @ptr, along
+ * with additional entries specified by @keys and @ptrs arrays, into a NILFS B-tree.
+ * It prepares the necessary changes by allocating the required blocks and any
+ * necessary intermediate nodes. This function handles the conversion of a B-tree
+ * node when it is necessary to split it due to the size constraint.
+ *
+ * Return: 0 on success or a negative error code on failure.
*/
int nilfs_btree_convert_and_insert(struct nilfs_bmap *btree,
__u64 key, __u64 ptr,
--
2.20.1.7.g153144c



2024-03-22 10:01:00

by Ryusuke Konishi

[permalink] [raw]
Subject: Re: [PATCH -next 2/3] fs: Add kernel-doc comments to nilfs_btree_convert_and_insert()

On Fri, Mar 22, 2024 at 4:32 PM Yang Li wrote:
>
> This commit adds kernel-doc style comments with complete parameter
> descriptions for the function nilfs_btree_convert_and_insert.
>
> Signed-off-by: Yang Li <[email protected]>
> ---
> fs/nilfs2/btree.c | 22 +++++++++++++++-------
> 1 file changed, 15 insertions(+), 7 deletions(-)
>
> diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c
> index 65659fa0372e..de38012fd87c 100644
> --- a/fs/nilfs2/btree.c
> +++ b/fs/nilfs2/btree.c
> @@ -1857,13 +1857,21 @@ nilfs_btree_commit_convert_and_insert(struct nilfs_bmap *btree,
> }
>
> /**
> - * nilfs_btree_convert_and_insert -
> - * @bmap:
> - * @key:
> - * @ptr:
> - * @keys:
> - * @ptrs:
> - * @n:
> + * nilfs_btree_convert_and_insert - Convert and insert entries into a B-tree
> + * @btree: NILFS B-tree structure
> + * @key: Key of the new entry to be inserted
> + * @ptr: Pointer (block number) associated with the key to be inserted
> + * @keys: Array of keys to be inserted in addition to @key
> + * @ptrs: Array of pointers associated with @keys
> + * @n: Number of keys and pointers in @keys and @ptrs
> + *
> + * This function is used to insert a new entry specified by @key and @ptr, along
> + * with additional entries specified by @keys and @ptrs arrays, into a NILFS B-tree.
> + * It prepares the necessary changes by allocating the required blocks and any
> + * necessary intermediate nodes. This function handles the conversion of a B-tree
> + * node when it is necessary to split it due to the size constraint.
> + *
> + * Return: 0 on success or a negative error code on failure.
> */
> int nilfs_btree_convert_and_insert(struct nilfs_bmap *btree,
> __u64 key, __u64 ptr,
> --
> 2.20.1.7.g153144c
>

Hi,

First of all, thank you for posting these patches.
These three kernel-doc comment completions are necessary.

One thing I would like to point out is that the last part of the
descriptive comment for this patch is not accurate.
nilfs_btree_convert_and_insert() is used to convert configurations
from other forms of block mapping (the one that currently exists is
direct mapping) to a B-tree, and is not intended to split a B-tree
node block on excess of the number of entries.

So, I'd like to slightly adjust the description for this patch and
send all three to upstream.
Or, if you want to fix it yourself, please send me the revised version.

Thanks,
Ryusuke Konishi