2022-06-19 15:12:56

by Gao Xiang

Subject: [PATCH] erofs: get rid of the leftover PAGE_SIZE in dir.c

Convert the last hardcoded PAGE_SIZEs of uncompressed cases.

Signed-off-by: Gao Xiang <[email protected]>
---
fs/erofs/dir.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/erofs/dir.c b/fs/erofs/dir.c
index 18e59821c597..723f5223a4fa 100644
--- a/fs/erofs/dir.c
+++ b/fs/erofs/dir.c
@@ -90,7 +90,7 @@ static int erofs_readdir(struct file *f, struct dir_context *ctx)

nameoff = le16_to_cpu(de->nameoff);
if (nameoff < sizeof(struct erofs_dirent) ||
- nameoff >= PAGE_SIZE) {
+ nameoff >= EROFS_BLKSIZ) {
erofs_err(dir->i_sb,
"invalid de[0].nameoff %u @ nid %llu",
nameoff, EROFS_I(dir)->nid);
@@ -99,7 +99,7 @@ static int erofs_readdir(struct file *f, struct dir_context *ctx)
}

maxsize = min_t(unsigned int,
- dirsize - ctx->pos + ofs, PAGE_SIZE);
+ dirsize - ctx->pos + ofs, EROFS_BLKSIZ);

/* search dirents at the arbitrary position */
if (initial) {
--
2.24.4

2022-07-22 06:13:09

by Jingbo Xu

Subject: Re: [PATCH] erofs: get rid of the leftover PAGE_SIZE in dir.c

On 6/19/22 11:09 PM, Gao Xiang wrote:
> Convert the last hardcoded PAGE_SIZEs of uncompressed cases.
>
> Signed-off-by: Gao Xiang <[email protected]>
> ---
> fs/erofs/dir.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/erofs/dir.c b/fs/erofs/dir.c
> index 18e59821c597..723f5223a4fa 100644
> --- a/fs/erofs/dir.c
> +++ b/fs/erofs/dir.c
> @@ -90,7 +90,7 @@ static int erofs_readdir(struct file *f, struct dir_context *ctx)
>
> nameoff = le16_to_cpu(de->nameoff);
> if (nameoff < sizeof(struct erofs_dirent) ||
> - nameoff >= PAGE_SIZE) {
> + nameoff >= EROFS_BLKSIZ) {
> erofs_err(dir->i_sb,
> "invalid de[0].nameoff %u @ nid %llu",
> nameoff, EROFS_I(dir)->nid);
> @@ -99,7 +99,7 @@ static int erofs_readdir(struct file *f, struct dir_context *ctx)
> }
>
> maxsize = min_t(unsigned int,
> - dirsize - ctx->pos + ofs, PAGE_SIZE);
> + dirsize - ctx->pos + ofs, EROFS_BLKSIZ);
>
> /* search dirents at the arbitrary position */
> if (initial) {

LGTM.

Reviewed-by: Jeffle Xu <[email protected]>

--
Thanks,
Jeffle