From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.groups.io with SMTP id smtpd.web08.15998.1658666182662580571 for ; Sun, 24 Jul 2022 05:36:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VEiSIsbq; spf=pass (domain: gmail.com, ip: 209.85.128.49, mailfrom: savvamtr@gmail.com) Received: by mail-wm1-f49.google.com with SMTP id r1-20020a05600c35c100b003a326685e7cso6136426wmq.1 for ; Sun, 24 Jul 2022 05:36:22 -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=VDSD6tzPwVm+zbOTlmzRT802cic8SRGd2yLf86xQTM8=; b=VEiSIsbqNhb62Mfe3lIwy9cf535WfESFZvfi/w0Kp9JC0kkka8iuFQLecGj9kDhQ5W DPHqxnQDBnssOjfFaRsfA6ekIXsKQE2OIKK4d4jrEkFW5rSxfq8fgurcMEmhWwnFuM8Q 8GNv394EBbw1clxmirr72SwK7NMEoqWd6/U/lvcPO/dfbuAm8y1UVZ+UWABxhYXG0URn lQOSH5r9arGixuEQy9/UNphOZHN/yRoSA91x0lnjiepgwywqeMV3Opi38dz5t9gF04Vj xtKHs6XL+gBYYprgzcad1KiJkF1zTc+bnLoO+mJvgMn6yeuJxsDfZjYWT9gc9zq9V44r y9lA== 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=VDSD6tzPwVm+zbOTlmzRT802cic8SRGd2yLf86xQTM8=; b=FAvNUOe7oYM2HAQn1DleANmSbt93s59rAVzlc+Lu9Sw1oZaYP7y5/g6H8rnlLTvwTe NVfCqQS7ozutB0DFmvt/WyPzbaiu3AlviXN/g8gosmuvIAXf0L6AtXNqnPqx5zCK8Q+S EO9EFOYReyW/nN+J9/NPPtOvisbXCQWOi25xDknAWbtZnOUGuRB5fRarqpyqRIfnagxf fwrYsUzdR2zwC7FMP5ND5M6kfKdovaJ6k8liRcFdkVmi3lVjDJexnujop93xqAQthJ4K PwcGQdRNOP6XS4rmoZsGYIP6wlJaEpIiUk8WGre0QFfnnGjA0H0mXUSbvWfGJ2bjUI6y t2+g== X-Gm-Message-State: AJIora+RqwLAKCgNJFJygQffoPTcNlV0Cz854qqdKN2zMQ3yeFYzLpwl f5riO6fKb2fRub4R+K517qxpIyx6/rHzIrdw X-Google-Smtp-Source: AGRyM1vv2kQecsrdTveysdH5G2fct+FHVpw0eqm+9LF8J5BkAgaLe6wawnbG/pQCbV/C1GFknYTNBQ== X-Received: by 2002:a7b:ca47:0:b0:3a3:1874:648 with SMTP id m7-20020a7bca47000000b003a318740648mr5359128wml.139.1658666180848; Sun, 24 Jul 2022 05:36:20 -0700 (PDT) Return-Path: Received: from TurboKeker.lan ([207.180.219.167]) by smtp.gmail.com with ESMTPSA id 9-20020a05600c22c900b003a3270735besm11001045wmg.28.2022.07.24.05.36.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jul 2022 05:36:20 -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 v3 2/2] Ext4Pkg: Add base containing record macro for EXT4_FILE Date: Sun, 24 Jul 2022 18:36:13 +0600 Message-Id: <20220724123613.36157-3-savvamtr@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220724123613.36157-1-savvamtr@gmail.com> References: <20220724123613.36157-1-savvamtr@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable We shouldn't use direct casts, because in the future it could break the code, so using BASE_CR would be safe against possible structure changes and rearrangements Cc: Marvin H=C3=A4user Cc: Pedro Falcato Cc: Vitaly Cheptsov Signed-off-by: Savva Mitrofanov --- Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h | 2 ++ Features/Ext4Pkg/Ext4Dxe/File.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h b/Features/Ext4Pkg/Ext4Dxe/= Ext4Dxe.h index c1df9d1149e4..1e63e6282fa5 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h +++ b/Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h @@ -382,6 +382,8 @@ struct _Ext4File { EXT4_DENTRY *Dentry;=0D };=0D =0D +#define EXT4_FILE_FROM_THIS(This) BASE_CR ((This), EXT4_FILE, Protocol)=0D +=0D #define EXT4_FILE_FROM_OPEN_FILES_NODE(Node) = \=0D BASE_CR(Node, EXT4_FILE, OpenFilesListNode)=0D =0D diff --git a/Features/Ext4Pkg/Ext4Dxe/File.c b/Features/Ext4Pkg/Ext4Dxe/Fil= e.c index 1aefacb59ad3..6d82ab061493 100644 --- a/Features/Ext4Pkg/Ext4Dxe/File.c +++ b/Features/Ext4Pkg/Ext4Dxe/File.c @@ -561,7 +561,7 @@ Ext4Open ( EXT4_FILE *FoundFile;=0D EXT4_FILE *Source;=0D =0D - Source =3D (EXT4_FILE *)This;=0D + Source =3D EXT4_FILE_FROM_THIS (This);=0D =0D //=0D // Reset SymLoops counter=0D @@ -598,7 +598,7 @@ Ext4Close ( IN EFI_FILE_PROTOCOL *This=0D )=0D {=0D - return Ext4CloseInternal ((EXT4_FILE *)This);=0D + return Ext4CloseInternal (EXT4_FILE_FROM_THIS (This));=0D }=0D =0D /**=0D @@ -679,7 +679,7 @@ Ext4ReadFile ( EXT4_PARTITION *Partition;=0D EFI_STATUS Status;=0D =0D - File =3D (EXT4_FILE *)This;=0D + File =3D EXT4_FILE_FROM_THIS (This);=0D Partition =3D File->Partition;=0D =0D ASSERT (Ext4FileIsOpenable (File));=0D @@ -730,7 +730,7 @@ Ext4WriteFile ( {=0D EXT4_FILE *File;=0D =0D - File =3D (EXT4_FILE *)This;=0D + File =3D EXT4_FILE_FROM_THIS (This);=0D =0D if (!(File->OpenMode & EFI_FILE_MODE_WRITE)) {=0D return EFI_ACCESS_DENIED;=0D @@ -760,7 +760,7 @@ Ext4GetPosition ( {=0D EXT4_FILE *File;=0D =0D - File =3D (EXT4_FILE *)This;=0D + File =3D EXT4_FILE_FROM_THIS (This);=0D =0D if (Ext4FileIsDir (File)) {=0D return EFI_UNSUPPORTED;=0D @@ -793,7 +793,7 @@ Ext4SetPosition ( {=0D EXT4_FILE *File;=0D =0D - File =3D (EXT4_FILE *)This;=0D + File =3D EXT4_FILE_FROM_THIS (This);=0D =0D // Only seeks to 0 (so it resets the ReadDir operation) are allowed=0D if (Ext4FileIsDir (File) && (Position !=3D 0)) {=0D @@ -1061,7 +1061,7 @@ Ext4GetInfo ( EXT4_FILE *File;=0D EXT4_PARTITION *Partition;=0D =0D - File =3D (EXT4_FILE *)This;=0D + File =3D EXT4_FILE_FROM_THIS (This);=0D Partition =3D File->Partition;=0D =0D if (CompareGuid (InformationType, &gEfiFileInfoGuid)) {=0D @@ -1178,7 +1178,7 @@ Ext4SetInfo ( EXT4_FILE *File;=0D EXT4_PARTITION *Partition;=0D =0D - File =3D (EXT4_FILE *)This;=0D + File =3D EXT4_FILE_FROM_THIS (This);=0D Partition =3D File->Partition;=0D =0D if (Partition->ReadOnly) {=0D --=20 2.37.1