diff options
| author | Darrick J. Wong <djwong@kernel.org> | 2023-06-05 08:36:38 -0700 |
|---|---|---|
| committer | Carlos Maiolino <cem@kernel.org> | 2023-06-14 10:35:07 +0200 |
| commit | cb8c70b017e30d4004373300bce488a9687166ac (patch) | |
| tree | fdb457aa0e0d63edd1b674d75fecc2621fabea0c | |
| parent | 03f97ae49b9cbeae21d14deabfa88c877d1cfeb8 (diff) | |
| download | xfsprogs-dev-cb8c70b017e30d4004373300bce488a9687166ac.tar.gz | |
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>
| -rw-r--r-- | db/metadump.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/db/metadump.c b/db/metadump.c index 27d1df4327..317ff72802 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; } |