* [PATCH v4] erofs: update ctx->pos for every emitted dirent
@ 2022-07-22 8:27 Jeffle Xu
2022-07-27 10:04 ` Gao Xiang
2022-07-31 13:18 ` Chao Yu
0 siblings, 2 replies; 4+ messages in thread
From: Jeffle Xu @ 2022-07-22 8:27 UTC (permalink / raw)
To: xiang, chao, linux-erofs; +Cc: linux-kernel
From: Hongnan Li <hongnan.li@linux.alibaba.com>
erofs_readdir update ctx->pos after filling a batch of dentries
and it may cause dir/files duplication for NFS readdirplus which
depends on ctx->pos to fill dir correctly. So update ctx->pos for
every emitted dirent in erofs_fill_dentries to fix it.
Also fix the update of ctx->pos when the initial file position has
exceeded nameoff.
Fixes: 3e917cc305c6 ("erofs: make filesystem exportable")
Signed-off-by: Hongnan Li <hongnan.li@linux.alibaba.com>
Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
---
fs/erofs/dir.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/fs/erofs/dir.c b/fs/erofs/dir.c
index 18e59821c597..47c85f1b80d8 100644
--- a/fs/erofs/dir.c
+++ b/fs/erofs/dir.c
@@ -22,10 +22,9 @@ static void debug_one_dentry(unsigned char d_type, const char *de_name,
}
static int erofs_fill_dentries(struct inode *dir, struct dir_context *ctx,
- void *dentry_blk, unsigned int *ofs,
+ void *dentry_blk, struct erofs_dirent *de,
unsigned int nameoff, unsigned int maxsize)
{
- struct erofs_dirent *de = dentry_blk + *ofs;
const struct erofs_dirent *end = dentry_blk + nameoff;
while (de < end) {
@@ -59,9 +58,8 @@ static int erofs_fill_dentries(struct inode *dir, struct dir_context *ctx,
/* stopped by some reason */
return 1;
++de;
- *ofs += sizeof(struct erofs_dirent);
+ ctx->pos += sizeof(struct erofs_dirent);
}
- *ofs = maxsize;
return 0;
}
@@ -95,7 +93,7 @@ static int erofs_readdir(struct file *f, struct dir_context *ctx)
"invalid de[0].nameoff %u @ nid %llu",
nameoff, EROFS_I(dir)->nid);
err = -EFSCORRUPTED;
- goto skip_this;
+ break;
}
maxsize = min_t(unsigned int,
@@ -106,17 +104,17 @@ static int erofs_readdir(struct file *f, struct dir_context *ctx)
initial = false;
ofs = roundup(ofs, sizeof(struct erofs_dirent));
+ ctx->pos = blknr_to_addr(i) + ofs;
if (ofs >= nameoff)
goto skip_this;
}
- err = erofs_fill_dentries(dir, ctx, de, &ofs,
+ err = erofs_fill_dentries(dir, ctx, de, (void *)de + ofs,
nameoff, maxsize);
-skip_this:
- ctx->pos = blknr_to_addr(i) + ofs;
-
if (err)
break;
+skip_this:
+ ctx->pos = blknr_to_addr(i) + maxsize;
++i;
ofs = 0;
}
--
2.27.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v4] erofs: update ctx->pos for every emitted dirent
2022-07-22 8:27 [PATCH v4] erofs: update ctx->pos for every emitted dirent Jeffle Xu
@ 2022-07-27 10:04 ` Gao Xiang
2022-07-31 13:18 ` Chao Yu
1 sibling, 0 replies; 4+ messages in thread
From: Gao Xiang @ 2022-07-27 10:04 UTC (permalink / raw)
To: Jeffle Xu; +Cc: xiang, chao, linux-erofs, linux-kernel
On Fri, Jul 22, 2022 at 04:27:32PM +0800, Jeffle Xu wrote:
> From: Hongnan Li <hongnan.li@linux.alibaba.com>
>
> erofs_readdir update ctx->pos after filling a batch of dentries
> and it may cause dir/files duplication for NFS readdirplus which
> depends on ctx->pos to fill dir correctly. So update ctx->pos for
> every emitted dirent in erofs_fill_dentries to fix it.
>
> Also fix the update of ctx->pos when the initial file position has
> exceeded nameoff.
>
> Fixes: 3e917cc305c6 ("erofs: make filesystem exportable")
> Signed-off-by: Hongnan Li <hongnan.li@linux.alibaba.com>
> Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Thanks,
Gao Xiang
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v4] erofs: update ctx->pos for every emitted dirent
@ 2022-07-27 10:04 ` Gao Xiang
0 siblings, 0 replies; 4+ messages in thread
From: Gao Xiang @ 2022-07-27 10:04 UTC (permalink / raw)
To: Jeffle Xu; +Cc: linux-erofs, linux-kernel
On Fri, Jul 22, 2022 at 04:27:32PM +0800, Jeffle Xu wrote:
> From: Hongnan Li <hongnan.li@linux.alibaba.com>
>
> erofs_readdir update ctx->pos after filling a batch of dentries
> and it may cause dir/files duplication for NFS readdirplus which
> depends on ctx->pos to fill dir correctly. So update ctx->pos for
> every emitted dirent in erofs_fill_dentries to fix it.
>
> Also fix the update of ctx->pos when the initial file position has
> exceeded nameoff.
>
> Fixes: 3e917cc305c6 ("erofs: make filesystem exportable")
> Signed-off-by: Hongnan Li <hongnan.li@linux.alibaba.com>
> Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Thanks,
Gao Xiang
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v4] erofs: update ctx->pos for every emitted dirent
2022-07-22 8:27 [PATCH v4] erofs: update ctx->pos for every emitted dirent Jeffle Xu
2022-07-27 10:04 ` Gao Xiang
@ 2022-07-31 13:18 ` Chao Yu
1 sibling, 0 replies; 4+ messages in thread
From: Chao Yu @ 2022-07-31 13:18 UTC (permalink / raw)
To: Jeffle Xu, xiang, linux-erofs; +Cc: linux-kernel
On 2022/7/22 16:27, Jeffle Xu wrote:
> From: Hongnan Li <hongnan.li@linux.alibaba.com>
>
> erofs_readdir update ctx->pos after filling a batch of dentries
> and it may cause dir/files duplication for NFS readdirplus which
> depends on ctx->pos to fill dir correctly. So update ctx->pos for
> every emitted dirent in erofs_fill_dentries to fix it.
>
> Also fix the update of ctx->pos when the initial file position has
> exceeded nameoff.
>
> Fixes: 3e917cc305c6 ("erofs: make filesystem exportable")
> Signed-off-by: Hongnan Li <hongnan.li@linux.alibaba.com>
> Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Thanks,
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-07-31 13:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-22 8:27 [PATCH v4] erofs: update ctx->pos for every emitted dirent Jeffle Xu
2022-07-27 10:04 ` Gao Xiang
2022-07-27 10:04 ` Gao Xiang
2022-07-31 13:18 ` Chao Yu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.