From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) by mx.groups.io with SMTP id smtpd.web12.33733.1659022019212136356 for ; Thu, 28 Jul 2022 08:26:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=AbmKL51p; spf=pass (domain: gmail.com, ip: 209.85.208.176, mailfrom: savvamtr@gmail.com) Received: by mail-lj1-f176.google.com with SMTP id u17so2327381lji.5 for ; Thu, 28 Jul 2022 08:26:58 -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=m2Y4QrfPv1vLnn6EziivAOofQnEg5Jzmg71ScdoA9eM=; b=AbmKL51pZMQkmNtodeg2xoZBje+jk057qHFjO8TR5z7ZQ/6kyoBczC3FYVZhshGX7U qHPf5lJu4Ig7n8fiCTahwWbC3U95jQ/RjFpiOtq4GTLUgzKci0iwFHufo3jOuZSfkVUS ShfX1XRpxNT7rSpDpjHjMpC5eQGnQn+ZgFaRU18id6DN5XtVAr71VGtxM0LhsvkN73Lg RWg41KZP2wRsQ2Kak9Ul+xMbLizT4lUNreCznXBNwMktJt0dBRFaVuZySgHqAEGZeYod k9zs9McgMhDarGvfNLhU2RIyWJwBYXwiUhtB986pAkc8tfkzSFB3c9CI6lefmMCTDNcO 7ZOg== 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=m2Y4QrfPv1vLnn6EziivAOofQnEg5Jzmg71ScdoA9eM=; b=VYL8blb7I6H4qGydje51ldjua3VET6SIjPf6l5AggoD+6tXJeGL+C74OdvE5hwFhXv c/1Mnjg1zECeIs13eLeShvb2MVsBl1OH1zq/KTD6nuRGb/NIR0JGodEmThOipHtMTSY6 xWbUSRyFQwp3feP/UL3Wz2Sky3FEOpL4H1QmwEy1m9KhTj4rQXbTIAimc42JW4uljfua Yr0hk88x2crEXmo5kBLdQOppBpbLlTS5fiWZJK/W6xCKOixnZD9U7uNNS+x40znVhpdd zRlp3Hf++pK2bebJrt18Tmhg+jD+lWEXe5C41RzDJrSL93SG6AMq+G3fRM0u61tAfN4n B+Cw== X-Gm-Message-State: AJIora/17SFkZTUZdNuOYjWH+v+AZ7vkdzMBgI31N8muvrH+pE7692ZO cC0Z8PuXrXFUf9kMpt9WAPvmdMYvIVGzpY6yj+M= X-Google-Smtp-Source: AGRyM1ub2nFzy6sMG/Y/FbRTkmC3it7+f4fBb7lO56fWVy438IKBs39KdPgGEUK7Nh6be/egck2NZA== X-Received: by 2002:a2e:be90:0:b0:25d:60eb:e4f4 with SMTP id a16-20020a2ebe90000000b0025d60ebe4f4mr9612187ljr.162.1659022017245; Thu, 28 Jul 2022 08:26:57 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([207.180.219.167]) by smtp.gmail.com with ESMTPSA id j1-20020ac253a1000000b0048aace12740sm237821lfh.270.2022.07.28.08.26.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jul 2022 08:26:56 -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 v4 2/2] Ext4Pkg: Add base containing record macro for EXT4_FILE Date: Thu, 28 Jul 2022 21:26:44 +0600 Message-Id: <20220728152644.11435-3-savvamtr@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220728152644.11435-1-savvamtr@gmail.com> References: <20220728152644.11435-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 ae9230d6422b..b1744ad56c98 100644 --- a/Features/Ext4Pkg/Ext4Dxe/File.c +++ b/Features/Ext4Pkg/Ext4Dxe/File.c @@ -562,7 +562,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 @@ -599,7 +599,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 @@ -680,7 +680,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 @@ -731,7 +731,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 @@ -761,7 +761,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 @@ -794,7 +794,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 @@ -1062,7 +1062,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 @@ -1179,7 +1179,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