From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by mx.groups.io with SMTP id smtpd.web08.50614.1658297841454780454 for ; Tue, 19 Jul 2022 23:17:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=fNMRWM6Z; spf=pass (domain: gmail.com, ip: 209.85.218.47, mailfrom: savvamtr@gmail.com) Received: by mail-ej1-f47.google.com with SMTP id sz17so31191146ejc.9 for ; Tue, 19 Jul 2022 23:17:21 -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=tAq30tx60IItulcKBG03NqgKmfZ2o0WPAnjU8IZiRNE=; b=fNMRWM6ZwJBZTz00SP1nhlTzuKlADaRfdCohRKGXarQjMZrLlKyZ6GP2NWIIgWFnWs OcLsWLo7NBu+9EzsZedBT1ZP5C/kTHxuA+cqeoxRnwn9nqstq052pj49YC3ykDUKsSTb lzX3EH1GwmHx/g0VY8ymZrLP7IAmA6a+0mDR2gTzaa9Q2PJLuGB2L93WmVyH3Kl04mdI W7FTvmOepnly/EZpmocwkT7IoWv7gW4aUG4VtL6gN3jHf+vCJxwvOQ7WKqHNrDtArfaA sQjVOqy9smQi2jmvgN24Dxxs5Xu7whyuQL3yP2qn7YelJVYRkRTEj9d2psfR5SJWUlfs byaw== 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=tAq30tx60IItulcKBG03NqgKmfZ2o0WPAnjU8IZiRNE=; b=dNjD0Oiw07N5pwzB1pDfGdkEdYf0VTC/k5gR6TQx+senPRZ8J6IokktBJ5F7mnUnLy Bn+CXgahD+vGt6lGxy7j5hIUrIS6feWzffW14qZB7vggR4q9SoX5dj/IOo4Sxxf7xBq2 aD8eRmbvLHkkbLUbuoY7x3oDX4+32Iu3pTJj1fmtvDPMpsn/LQS8NGk2Lixyn8RDWHxA bHwW1TqxNDjq5DvJYWtESPC92FF+a9ujU+i8WoPt73NbWEoF+L6wO+E6eJFdAESCCQJ0 J/ODqDXp++SQQflNC0oM8uOERWMYkPKdLz690jH80LGlmoiDSqmHfkieIiK+sDWm3gfq AJww== X-Gm-Message-State: AJIora8Q8HxvgVCUoIN+Neu06C4YqC9Elt7/GkcMWhxWLk2KukyNZjTE M0UGLK+tzzlA9dN6GlhqLM6YjMTA/K4HLhqSWDI= X-Google-Smtp-Source: AGRyM1splQgh9K+MfOHI1j+5Yeyxhj4vAKjqwf3Ri+2W7ltKmbE1WNUkWL826TJ4PNHN7R9P1hxSaQ== X-Received: by 2002:a17:907:72c6:b0:72f:b01:2723 with SMTP id du6-20020a17090772c600b0072f0b012723mr20325365ejc.439.1658297839593; Tue, 19 Jul 2022 23:17:19 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([207.180.219.167]) by smtp.gmail.com with ESMTPSA id f17-20020a056402151100b0043b986751a7sm2104378edw.41.2022.07.19.23.17.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Jul 2022 23:17:19 -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 2/2] Ext4Pkg: Add base containing record macro for EXT4_FILE Date: Wed, 20 Jul 2022 12:17:02 +0600 Message-Id: <20220720061702.40770-3-savvamtr@gmail.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220720061702.40770-1-savvamtr@gmail.com> References: <20220720061702.40770-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 a1eb32aa2cff..3ff7b29e7133 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h +++ b/Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h @@ -383,6 +383,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 0fb9e05e6647..750397010443 100644 --- a/Features/Ext4Pkg/Ext4Dxe/File.c +++ b/Features/Ext4Pkg/Ext4Dxe/File.c @@ -568,7 +568,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 @@ -605,7 +605,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 @@ -686,7 +686,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 @@ -737,7 +737,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 @@ -767,7 +767,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 @@ -800,7 +800,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 @@ -1068,7 +1068,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 @@ -1185,7 +1185,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.0