[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20201105161642.87488-9-arnaud.ferraris@collabora.com>
Date: Thu, 5 Nov 2020 17:16:40 +0100
From: Arnaud Ferraris <arnaud.ferraris@...labora.com>
To: linux-ext4@...r.kernel.org
Cc: Gabriel Krisman Bertazi <krisman@...labora.com>,
Arnaud Ferraris <arnaud.ferraris@...labora.com>
Subject: [PATCH 08/11] e2fsck: Detect duplicated casefolded direntries for rehash
From: Gabriel Krisman Bertazi <krisman@...labora.com>
On pass2, support casefolded directories when looking for duplicated
entries.
Signed-off-by: Gabriel Krisman Bertazi <krisman@...labora.com>
Signed-off-by: Arnaud Ferraris <arnaud.ferraris@...labora.com>
---
e2fsck/pass2.c | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c
index c9eba7c0..da00e244 100644
--- a/e2fsck/pass2.c
+++ b/e2fsck/pass2.c
@@ -344,6 +344,20 @@ static int dict_de_cmp(const void *cmp_ctx, const void *a, const void *b)
return memcmp(de_a->name, de_b->name, a_len);
}
+static int dict_de_cf_cmp(const void *cmp_ctx, const void *a, const void *b)
+{
+ const struct ext2fs_nls_table *tbl = cmp_ctx;
+ const struct ext2_dir_entry *de_a, *de_b;
+ int a_len, b_len;
+
+ de_a = (const struct ext2_dir_entry *) a;
+ a_len = ext2fs_dirent_name_len(de_a);
+ de_b = (const struct ext2_dir_entry *) b;
+ b_len = ext2fs_dirent_name_len(de_b);
+
+ return ext2fs_casefold_cmp(tbl, de_a->name, a_len, de_b->name, b_len);
+}
+
/*
* This is special sort function that makes sure that directory blocks
* with a dirblock of zero are sorted to the beginning of the list.
@@ -1255,7 +1269,13 @@ skip_checksum:
dir_encpolicy_id = find_encryption_policy(ctx, ino);
- dict_init(&de_dict, DICTCOUNT_T_MAX, dict_de_cmp);
+ if (cf_dir) {
+ dict_init(&de_dict, DICTCOUNT_T_MAX, dict_de_cf_cmp);
+ dict_set_cmp_context(&de_dict, (void *)ctx->fs->encoding);
+ } else {
+ dict_init(&de_dict, DICTCOUNT_T_MAX, dict_de_cmp);
+ }
+
prev = 0;
do {
dgrp_t group;
--
2.28.0
Powered by blists - more mailing lists