Messages in this thread Patch in this message | | | From | Jaegeuk Kim <> | Subject | [PATCH] f2fs: fix readdir incorrectness | Date | Fri, 05 Jul 2013 14:22:10 +0900 |
| |
In the previous Al Viro's readdir patch set, there occurs a bug when running xfstest: 006 as follows.
[Error output] alpha size = 4, name length = 6, total files = 4096, nproc=1 1023 files created rm: cannot remove `/mnt/f2fs/permname.15150/a': Directory not empty
[Correct output] alpha size = 4, name length = 6, total files = 4096, nproc=1 4097 files created
This bug is due to the misupdate of directory position in ctx. So, this patch fixes this.
CC: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com> --- fs/f2fs/dir.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 9d1cd42..8008d60 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -634,7 +634,6 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx) if (bit_pos >= NR_DENTRY_IN_BLOCK) break; - ctx->pos += bit_pos - start_bit_pos; de = &dentry_blk->dentry[bit_pos]; if (de->file_type < F2FS_FT_MAX) d_type = f2fs_filetype_table[de->file_type]; @@ -643,8 +642,10 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx) if (!dir_emit(ctx, dentry_blk->filename[bit_pos], le16_to_cpu(de->name_len), - le32_to_cpu(de->ino), d_type)) + le32_to_cpu(de->ino), d_type)) { + ctx->pos += bit_pos - start_bit_pos; goto success; + } slots = GET_DENTRY_SLOTS(le16_to_cpu(de->name_len)); bit_pos += slots; } -- 1.8.3.1.437.g0dbd812
| |