From: Andreas Dilger <adilger@whamcloud.com>
Date: Tue, 9 Feb 2021 07:46:23 +0000 (-0700)
Subject: LU-5949 e2fsck: call delete_inode() properly
X-Git-Tag: v1.45.6.wc5~1
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=4aea203f2d490f53596eb21233bf0c186a5b3679;p=tools%2Fe2fsprogs.git

LU-5949 e2fsck: call delete_inode() properly

Fix incorrect argument for delete_inode() in pass1b().

Fixes: 8725134d2757 ("LU-5949 e2fsck: simplify inode badness handling")
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: Ib90d87055e2c9359005034d06d88b083423ebbe5
Reviewed-on: https://review.whamcloud.com/41450
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Artem Blagodarenko <artem.blagodarenko@hpe.com>
Reviewed-by: Wang Shilong <wshilong@whamcloud.com>
Reviewed-by: Li Dongyang <dongyangli@ddn.com>
Tested-by: Maloo <maloo@whamcloud.com>
---

diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c
index 26a1f04..71ea63e 100644
--- a/e2fsck/pass1b.c
+++ b/e2fsck/pass1b.c
@@ -341,7 +341,10 @@ static void pass1b(e2fsck_t ctx, char *block_buf)
 		pb.pctx->blk = pb.pctx->blk2 = 0;
 
 		if (e2fsck_fix_bad_inode(ctx, &pctx)) {
-			delete_file(ctx, ino, &pb, block_buf);
+			struct dup_inode dp = { .inode = inode };
+
+			/* delete_file only uses dp.inode */
+			delete_file(ctx, ino, &dp, block_buf);
 			continue;
 		}