From eec6f7a2755dfccc8f655aa37cf6f26db9164e60 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Tue, 3 Dec 2024 16:45:31 +0900 Subject: [PATCH] erofs-utils: mkfs: make output stable The iteration order of opendir/readdir depends on filesystem implementation. Initializng inode->i_ino[0] in the loop causes the output unstable even though the entries are sorted in erofs_prepare_dir_file(). In this change, inode->i_ino[0] is initialized in erofs_prepare_inode_buffer() instead to make the output stable. (not affected by readdir()) # should generate the same output Test: mkfs.erofs ... inputdir(ext3) Test: mkfs.erofs ... inputdir(tmpfs) Signed-off-by: Jooyung Han Link: https://lore.kernel.org/r/20241203074531.3728133-1-jooyung@google.com Signed-off-by: Gao Xiang --- lib/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/inode.c b/lib/inode.c index e2888a4..7e5c581 100644 --- a/lib/inode.c +++ b/lib/inode.c @@ -821,6 +821,7 @@ noinline: bh->fsprivate = erofs_igrab(inode); bh->op = &erofs_write_inode_bhops; inode->bh = bh; + inode->i_ino[0] = ++inode->sbi->inos; /* inode serial number */ return 0; } @@ -1114,7 +1115,6 @@ struct erofs_inode *erofs_new_inode(struct erofs_sb_info *sbi) return ERR_PTR(-ENOMEM); inode->sbi = sbi; - inode->i_ino[0] = sbi->inos++; /* inode serial number */ inode->i_count = 1; inode->datalayout = EROFS_INODE_FLAT_PLAIN; -- 2.34.1