在 2022/10/10 16:09, Karel Zak 写道:
On Fri, Sep 30, 2022 at 09:20:42AM +0200, Lukas Czerner wrote:
On Fri, Sep 30, 2022 at 09:42:52AM +0800, zhanchengbin wrote:
On 2022/9/29 19:28, Lukas Czerner wrote:
Hi,
indeed we'd like to avoid killing the instance that was not ran because
of noexecute. Can you try the following patch?
Thanks!
-Lukas
Yes, you're right, I think we can fix it in this way.
diff --git a/misc/fsck.c b/misc/fsck.c
index 1f6ec7d9..91edbf17 100644
--- a/misc/fsck.c
+++ b/misc/fsck.c
@@ -547,6 +547,8 @@ static int kill_all(int signum)
for (inst = instance_list; inst; inst = inst->next) {
if (inst->flags & FLAG_DONE)
continue;
+ if (inst->pid == -1)
+ continue;
Yeah, that works as well although I find the "if (noexecute)" condition
more obvious. We can do both. Also rather than checking for -1 we can
check for <= 0 since anything other than real pid at this point is a bug.
Feel free to send a proper patch.
Yes, please. It would be nice to have the same solution in the both
(e2fsprogs and util-linux) trees.
Ok, I have sent the patch, please review it.
-zhanchengbin
Karel