Re: [PATCH v8 2/7] 9pfs: make v9fs_readdir_response_size() public

[Greg Kurz]

On Wed, 29 Jul 2020 10:11:15 +0200
Christian Schoenebeck <qemu_oss@crudebyte.com> wrote:

> Rename function v9fs_readdir_data_size() -> v9fs_readdir_response_size()
> and make it callable from other units. So far this function is only
> used by 9p.c, however subsequent patches require the function to be
> callable from another 9pfs unit. And as we're at it; also make it clear
> for what this function is used for.
> 
> Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
> ---

Reviewed-by: Greg Kurz <groug@kaod.org>

>  hw/9pfs/9p.c | 10 ++++++++--
>  hw/9pfs/9p.h |  1 +
>  2 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
> index 2ffd96ade9..7a228c4828 100644
> --- a/hw/9pfs/9p.c
> +++ b/hw/9pfs/9p.c
> @@ -2313,7 +2313,13 @@ out_nofid:
>      pdu_complete(pdu, err);
>  }
>  
> -static size_t v9fs_readdir_data_size(V9fsString *name)
> +/**
> + * Returns size required in Rreaddir response for the passed dirent @p name.
> + *
> + * @param name - directory entry's name (i.e. file name, directory name)
> + * @returns required size in bytes
> + */
> +size_t v9fs_readdir_response_size(V9fsString *name)
>  {
>      /*
>       * Size of each dirent on the wire: size of qid (13) + size of offset (8)
> @@ -2348,7 +2354,7 @@ static int coroutine_fn v9fs_do_readdir(V9fsPDU *pdu, 
> V9fsFidState *fidp,
>          }
>          v9fs_string_init(&name);
>          v9fs_string_sprintf(&name, "%s", dent->d_name);
> -        if ((count + v9fs_readdir_data_size(&name)) > max_count) {
> +        if ((count + v9fs_readdir_response_size(&name)) > max_count) {
>              v9fs_readdir_unlock(&fidp->fs.dir);
>  
>              /* Ran out of buffer. Set dir back to old position and return */
> diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h
> index ee2271663c..561774e843 100644
> --- a/hw/9pfs/9p.h
> +++ b/hw/9pfs/9p.h
> @@ -419,6 +419,7 @@ void v9fs_path_init(V9fsPath *path);
>  void v9fs_path_free(V9fsPath *path);
>  void v9fs_path_sprintf(V9fsPath *path, const char *fmt, ...);
>  void v9fs_path_copy(V9fsPath *dst, const V9fsPath *src);
> +size_t v9fs_readdir_response_size(V9fsString *name);
>  int v9fs_name_to_path(V9fsState *s, V9fsPath *dirpath,
>                        const char *name, V9fsPath *path);
>  int v9fs_device_realize_common(V9fsState *s, const V9fsTransport *t,