445a5d371c
Backport from xfs kernel git repository: This fix has already been merged into xfs kernel git repository: Link: https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/commit/?id=d878935dd9af126801d499afd9c6c1224797eeee And the original discussion for this patch can be found: Link: https://marc.info/?l=linux-xfs&m=166178369302374&w=2 Signed-off-by: Xiaole He <hexiaole@kylinos.cn>
64 lines
2.4 KiB
Diff
64 lines
2.4 KiB
Diff
From 7fcc602962ba54ef6f9d30f128c1a88a5a44e75a Mon Sep 17 00:00:00 2001
|
|
From: Xiaole He <hexiaole1994@126.com>
|
|
Date: Mon, 29 Aug 2022 17:50:25 +0800
|
|
Subject: [PATCH] xfs_db: use preferable macro to seek offset for local dir3
|
|
entry fields
|
|
|
|
In 'xfsprogs-dev' source:
|
|
|
|
/* db/dir2sf.c begin */
|
|
#define EOFF(f) bitize(offsetof(xfs_dir2_sf_entry_t, f))
|
|
const field_t dir2_sf_entry_flds[] = {
|
|
{ "namelen", FLDT_UINT8D, OI(EOFF(namelen)), C1, 0, TYP_NONE },
|
|
...
|
|
#define E3OFF(f) bitize(offsetof(xfs_dir2_sf_entry_t, f))
|
|
const field_t dir3_sf_entry_flds[] = {
|
|
{ "namelen", FLDT_UINT8D, OI(EOFF(namelen)), C1, 0, TYP_NONE },
|
|
...
|
|
/* db/dir2sf.c end */
|
|
|
|
The macro definitions of 'EOFF' and 'E3OFF' are same, so no matter to
|
|
use either to seek field offset in 'dir3_sf_entry_flds'.
|
|
But it seems the intent of defining 'E3OFF' macro is to be used in
|
|
'dir3_sf_entry_flds', and 'E3OFF' macro has not been used at any place
|
|
of the 'xfsprogs-dev' source:
|
|
|
|
/* command begin */
|
|
$ grep -r E3OFF /path/to/xfsprogs-dev/git/repository/
|
|
./db/dir2sf.c:#define E3OFF(f) bitize(offsetof(xfs_dir2_sf_entry_t, f))
|
|
$
|
|
/* command end */
|
|
|
|
Above command shows the 'E3OFF' is only been defined but nerver been
|
|
used, that is weird, so there has reason to suspect using 'EOFF'
|
|
rather than 'E3OFF' in 'dir3_sf_entry_flds' is a typo, this patch fix
|
|
it, there has no logical change in this commit at all.
|
|
|
|
Signed-off-by: Xiaole He <hexiaole@kylinos.cn>
|
|
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
|
|
Signed-off-by: Carlos Maiolino <cem@kernel.org>
|
|
---
|
|
db/dir2sf.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/db/dir2sf.c b/db/dir2sf.c
|
|
index 8165b79..9f1880d 100644
|
|
--- a/db/dir2sf.c
|
|
+++ b/db/dir2sf.c
|
|
@@ -246,9 +246,9 @@ const field_t dir3sf_flds[] = {
|
|
|
|
#define E3OFF(f) bitize(offsetof(xfs_dir2_sf_entry_t, f))
|
|
const field_t dir3_sf_entry_flds[] = {
|
|
- { "namelen", FLDT_UINT8D, OI(EOFF(namelen)), C1, 0, TYP_NONE },
|
|
- { "offset", FLDT_DIR2_SF_OFF, OI(EOFF(offset)), C1, 0, TYP_NONE },
|
|
- { "name", FLDT_CHARNS, OI(EOFF(name)), dir2_sf_entry_name_count,
|
|
+ { "namelen", FLDT_UINT8D, OI(E3OFF(namelen)), C1, 0, TYP_NONE },
|
|
+ { "offset", FLDT_DIR2_SF_OFF, OI(E3OFF(offset)), C1, 0, TYP_NONE },
|
|
+ { "name", FLDT_CHARNS, OI(E3OFF(name)), dir2_sf_entry_name_count,
|
|
FLD_COUNT, TYP_NONE },
|
|
{ "inumber", FLDT_DIR2_INOU, dir3_sf_entry_inumber_offset, C1,
|
|
FLD_OFFSET, TYP_NONE },
|
|
--
|
|
2.27.0
|
|
|