2023-06-01 02:46:30

by Jingbo Xu

Subject: [PATCH v5 4/6] erofs: make the size of read data stored in buffer_ofs

Since now xattr_iter structures have been unified, make the size of the
read data stored in buffer_ofs. Don't bother reusing buffer_size for
this use, which may be confusing.

This is in preparation for the following further cleanup.

Signed-off-by: Jingbo Xu <[email protected]>
---
fs/erofs/xattr.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/erofs/xattr.c b/fs/erofs/xattr.c
index a691d539ae4f..19f9bf67440c 100644
--- a/fs/erofs/xattr.c
+++ b/fs/erofs/xattr.c
@@ -337,7 +337,7 @@ static int xattr_checkbuffer(struct erofs_xattr_iter *it,
{
int err = it->buffer_size < value_sz ? -ERANGE : 0;

- it->buffer_size = value_sz;
+ it->buffer_ofs = value_sz;
return !it->buffer ? 1 : err;
}

@@ -370,7 +370,7 @@ static int inline_getxattr(struct inode *inode, struct erofs_xattr_iter *it)
if (ret != -ENOATTR)
break;
}
- return ret ? ret : it->buffer_size;
+ return ret ? ret : it->buffer_ofs;
}

static int shared_getxattr(struct inode *inode, struct erofs_xattr_iter *it)
@@ -392,7 +392,7 @@ static int shared_getxattr(struct inode *inode, struct erofs_xattr_iter *it)
if (ret != -ENOATTR)
break;
}
- return ret ? ret : it->buffer_size;
+ return ret ? ret : it->buffer_ofs;
}

static bool erofs_xattr_user_list(struct dentry *dentry)
--
2.19.1.6.gb485710b

2023-06-01 03:39:54

by Gao Xiang

Subject: Re: [PATCH v5 4/6] erofs: make the size of read data stored in buffer_ofs

On 2023/6/1 10:43, Jingbo Xu wrote:
> Since now xattr_iter structures have been unified, make the size of the
> read data stored in buffer_ofs. Don't bother reusing buffer_size for
> this use, which may be confusing.
>
> This is in preparation for the following further cleanup.
>
> Signed-off-by: Jingbo Xu <[email protected]>

Reviewed-by: Gao Xiang <[email protected]>

Thanks,
Gao Xiang

> ---
> fs/erofs/xattr.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/erofs/xattr.c b/fs/erofs/xattr.c
> index a691d539ae4f..19f9bf67440c 100644
> --- a/fs/erofs/xattr.c
> +++ b/fs/erofs/xattr.c
> @@ -337,7 +337,7 @@ static int xattr_checkbuffer(struct erofs_xattr_iter *it,
> {
> int err = it->buffer_size < value_sz ? -ERANGE : 0;
>
> - it->buffer_size = value_sz;
> + it->buffer_ofs = value_sz;
> return !it->buffer ? 1 : err;
> }
>
> @@ -370,7 +370,7 @@ static int inline_getxattr(struct inode *inode, struct erofs_xattr_iter *it)
> if (ret != -ENOATTR)
> break;
> }
> - return ret ? ret : it->buffer_size;
> + return ret ? ret : it->buffer_ofs;
> }
>
> static int shared_getxattr(struct inode *inode, struct erofs_xattr_iter *it)
> @@ -392,7 +392,7 @@ static int shared_getxattr(struct inode *inode, struct erofs_xattr_iter *it)
> if (ret != -ENOATTR)
> break;
> }
> - return ret ? ret : it->buffer_size;
> + return ret ? ret : it->buffer_ofs;
> }
>
> static bool erofs_xattr_user_list(struct dentry *dentry)