From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by mx.groups.io with SMTP id smtpd.web12.39755.1658232645099588572 for ; Tue, 19 Jul 2022 05:10:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Govqs/ud; spf=pass (domain: gmail.com, ip: 209.85.167.54, mailfrom: savvamtr@gmail.com) Received: by mail-lf1-f54.google.com with SMTP id bp17so24434871lfb.3 for ; Tue, 19 Jul 2022 05:10:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a82nyIphklI6Tdy5ae5IqV3+79a41sHn7hUAnKW3pI8=; b=Govqs/udSQVlo33LFswEYFnaPbZlufJ9AYm2z6Z6tTm2tS9fNOCS8sZLpCS3nUQkkP YCrC6/POlLyOZVy5AXW+pU3koGQeGAhBa9HCwlK8FTuPJeRt8mSVmvUxbWIndi9xyuKP fK0zzMcA13bOzxZEycw745wM+yvzGH4vTan1CvyVHKzaWwYQlSqVBm1BSH7+aU8KoUxc DtKGAJK+YVfYpz0j5MzPESW2CgRpCDgdbnBiDn++xyAcn+dqaUfzfukvxTM8PrD21beS 7UjdrgzHz5FjV2XcJm+f1zAh11Zq8Q0t/qK3KKONuQgTNmmvP9qn2BngbgoMf8qIMfqr N6Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a82nyIphklI6Tdy5ae5IqV3+79a41sHn7hUAnKW3pI8=; b=xuZnOH/d/B4lGfDFzw3oZB7dtsLxTSjjMvHvseOopbhnWi68HS8OT1l63QeH1HNQza ogODe3qEoJdNrA0yHosbcEmMN7g9y23kOyrTDSC5WVLRUF/LS1n3k581+ZuMmPQBiVXM UzDAsgMbNhWXbrF0BR6qutIMfGmKSPIZZPRk0fDVLsrKknchIv0mUEfC8iADq6Q+TvAl 1DB9nW+B4ER7Thqqem2ruQsasyTRghw1f020axq/Yb+K6AXtUZaFRJ/u1kYLMFGJ6Dim Q/PmKgpdittUTGtMKzxkqY5RHePDYR0te83/sIhqbJsrE7CCxlRXu30fhjQazgYADnB3 DINg== X-Gm-Message-State: AJIora/MNqkmvrh5hVZ8LBRuwHr2n1lhpL5Ff7PTKFWQQRns0cB2rItC 2okJpLklgarLLcOamh42F03ZzJZ8WjGtIFGqsqI= X-Google-Smtp-Source: AGRyM1vxeWNCASzq/rwNMlZWBKqFe6wkaMdj4MymN6i+LEb1unEUTfsxwUmThOTO1wN3UO1QIbx7ug== X-Received: by 2002:a05:6512:2315:b0:489:cbc1:886a with SMTP id o21-20020a056512231500b00489cbc1886amr16084471lfu.428.1658232643176; Tue, 19 Jul 2022 05:10:43 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([207.180.219.167]) by smtp.gmail.com with ESMTPSA id z20-20020a2eb534000000b0025d6ecbc897sm2668245ljm.46.2022.07.19.05.10.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Jul 2022 05:10:42 -0700 (PDT) From: "Savva Mitrofanov" To: devel@edk2.groups.io Cc: =?UTF-8?q?Marvin=20H=C3=A4user?= , Pedro Falcato , Vitaly Cheptsov Subject: [edk2-platforms][PATCH 07/10] Ext4Pkg: Simplify Ext4RemoveDentry logic Date: Tue, 19 Jul 2022 18:10:13 +0600 Message-Id: <20220719121016.29380-8-savvamtr@gmail.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220719121016.29380-1-savvamtr@gmail.com> References: <20220719121016.29380-1-savvamtr@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable First of all BASE_LIST_FOR_EACH_SAFE doesn't have any sanity checks. So its usage isn't "safe". We can drop this loop and use just IsNodeInList Cc: Marvin H=C3=A4user Cc: Pedro Falcato Cc: Vitaly Cheptsov Signed-off-by: Savva Mitrofanov --- Features/Ext4Pkg/Ext4Dxe/Directory.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/Features/Ext4Pkg/Ext4Dxe/Directory.c b/Features/Ext4Pkg/Ext4Dx= e/Directory.c index 96c84c24243e..d1038c04926e 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Directory.c +++ b/Features/Ext4Pkg/Ext4Dxe/Directory.c @@ -537,20 +537,8 @@ Ext4RemoveDentry ( IN OUT EXT4_DENTRY *ToBeRemoved=0D )=0D {=0D - EXT4_DENTRY *D;=0D - LIST_ENTRY *Entry;=0D - LIST_ENTRY *NextEntry;=0D -=0D - BASE_LIST_FOR_EACH_SAFE (Entry, NextEntry, &Parent->Children) {=0D - D =3D EXT4_DENTRY_FROM_DENTRY_LIST (Entry);=0D -=0D - if (D =3D=3D ToBeRemoved) {=0D - RemoveEntryList (Entry);=0D - return;=0D - }=0D - }=0D -=0D - DEBUG ((DEBUG_ERROR, "[ext4] Ext4RemoveDentry did not find the asked-for= dentry\n"));=0D + ASSERT (IsNodeInList (&ToBeRemoved->ListNode, &Parent->Children));=0D + RemoveEntryList (&ToBeRemoved->ListNode);=0D }=0D =0D /**=0D --=20 2.37.0