c49945ae5f
- Following is a list of dropped backported patches which are contained in the current rebase: xfsprogs-5.19.0-xfs-hoist-refcount-record-merge-predicates.patch (v6.2.0) xfsprogs-5.19.0-xfs_db-fix-dir3-block-magic-check.patch (v6.1.0) xfsprogs-5.19.0-xfs-estimate-post-merge-refcounts-correctly.patch (v6.2.0) xfsprogs-5.19.0-xfs-get-rid-of-assert-from-xfs_btree_islastblock.patch (v6.2.0) xfsprogs-5.19.0-xfs-fix-off-by-one-error-in-xfs_btree_space_to_heigh.patch (v6.2.0) xfsprogs-5.19.0-xfs-fix-sb-write-verify-for-lazysbcount.patch (v6.1.0) xfsprogs-5.19.0-xfs-removed-useless-condition-in-function-xfs_attr_n.patch (v6.0.0) xfsprogs-5.19.0-xfs_repair-retain-superblock-buffer-to-avoid-write-h.patch (v6.1.0) - Rename the remaining patches so the name contains upstream version in which they are implemented, or "rhelonly". - Drop Eric Sandeen's public key used to check tarball signature and replace it by Carlos Maiolino's (current upstream xfsprogs maintainer). - Following is a list of newly backported patches from versions released after 6.3 which are fixing patches present in version 6.3: xfsprogs-6.4.0-xfs_repair-don-t-add-junked-entries-to-the-rebuilt-d.patch xfsprogs-6.4.0-xfs_repair-don-t-spray-correcting-imap-all-by-itself.patch xfsprogs-6.4.0-xfs_repair-fix-messaging-when-fixing-imap-due-to-spa.patch xfsprogs-6.4.0-xfs_repair-fix-messaging-when-shortform_dir2_junk-is.patch - Backport: xfsprogs-6.4.0-xfs_db-move-obfuscate_name-assertion-to-callers.patch xfsprogs-6.4.0-xfs_db-fix-metadump-name-obfuscation-for-ascii-ci-fi.patch xfsprogs-6.4.0-xfs-stabilize-the-dirent-name-transformation-functio.patch to implement RHEL-RHEL-8284 - Backport xfsprogs-rhelonly-xfs_quota-fix-missing-mount-point-warning.patch to implement RHEL-7900 - Resolves: RHEL-15399 Resolves: RHEL-8284 Resolves: RHEL-7900 Signed-off-by: Pavel Reichl <preichl@redhat.com>
57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
From cb8c70b017e30d4004373300bce488a9687166ac Mon Sep 17 00:00:00 2001
|
|
From: "Darrick J. Wong" <djwong@kernel.org>
|
|
Date: Mon, 5 Jun 2023 08:36:38 -0700
|
|
Subject: [PATCH] xfs_db: move obfuscate_name assertion to callers
|
|
|
|
Currently, obfuscate_name asserts that the hash of the new name is the
|
|
same as the old name. To enable bug fixes in the next patch, move this
|
|
assertion to the callers.
|
|
|
|
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
|
|
Reviewed-by: Christoph Hellwig <hch@lst.de>
|
|
Signed-off-by: Carlos Maiolino <cem@kernel.org>
|
|
Signed-off-by: Pavel Reichl <preichl@redhat.com>
|
|
---
|
|
db/metadump.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/db/metadump.c b/db/metadump.c
|
|
index 27d1df43..317ff728 100644
|
|
--- a/db/metadump.c
|
|
+++ b/db/metadump.c
|
|
@@ -882,7 +882,6 @@ obfuscate_name(
|
|
*first ^= 0x10;
|
|
ASSERT(!is_invalid_char(*first));
|
|
}
|
|
- ASSERT(libxfs_da_hashname(name, name_len) == hash);
|
|
}
|
|
|
|
/*
|
|
@@ -1208,6 +1207,7 @@ generate_obfuscated_name(
|
|
|
|
hash = libxfs_da_hashname(name, namelen);
|
|
obfuscate_name(hash, namelen, name);
|
|
+ ASSERT(hash == libxfs_da_hashname(name, namelen));
|
|
|
|
/*
|
|
* Make sure the name is not something already seen. If we
|
|
@@ -1321,6 +1321,7 @@ obfuscate_path_components(
|
|
namelen = strnlen((char *)comp, len);
|
|
hash = libxfs_da_hashname(comp, namelen);
|
|
obfuscate_name(hash, namelen, comp);
|
|
+ ASSERT(hash == libxfs_da_hashname(comp, namelen));
|
|
break;
|
|
}
|
|
namelen = slash - (char *)comp;
|
|
@@ -1332,6 +1333,7 @@ obfuscate_path_components(
|
|
}
|
|
hash = libxfs_da_hashname(comp, namelen);
|
|
obfuscate_name(hash, namelen, comp);
|
|
+ ASSERT(hash == libxfs_da_hashname(comp, namelen));
|
|
comp += namelen + 1;
|
|
len -= namelen + 1;
|
|
}
|
|
--
|
|
2.41.0
|
|
|