From: Gabriel Krisman Bertazi <krisman@collabora.com>
To: Arnaud Ferraris <arnaud.ferraris@collabora.com>
Cc: linux-ext4@vger.kernel.org, drosen@google.com,
ebiggers@kernel.org, tytso@mit.edu
Subject: Re: [PATCH RESEND v2 07/12] e2fsck: Support casefold directories when rehashing
Date: Tue, 15 Dec 2020 14:34:45 -0300 [thread overview]
Message-ID: <87r1nrt1l6.fsf@collabora.com> (raw)
In-Reply-To: <40566e74-abd8-13df-45b9-2cf26f89ad54@collabora.com> (Arnaud Ferraris's message of "Tue, 15 Dec 2020 18:17:19 +0100")
Arnaud Ferraris <arnaud.ferraris@collabora.com> writes:
> Le 10/12/2020 à 21:53, Gabriel Krisman Bertazi a écrit :
>> Arnaud Ferraris <arnaud.ferraris@collabora.com> writes:
>>
>>> From: Gabriel Krisman Bertazi <krisman@collabora.com>
>>>
>>> @@ -403,11 +451,12 @@ static int duplicate_search_and_fix(e2fsck_t ctx, ext2_filsys fs,
>>> ent = fd->harray + i;
>>> prev = ent - 1;
>>> if (!ent->dir->inode ||
>>> - (ext2fs_dirent_name_len(ent->dir) !=
>>> - ext2fs_dirent_name_len(prev->dir)) ||
>>> - memcmp(ent->dir->name, prev->dir->name,
>>> - ext2fs_dirent_name_len(ent->dir)))
>>> + !same_name(cmp_ctx, ent->dir->name,
>>> + ext2fs_dirent_name_len(ent->dir),
>>> + prev->dir->name,
>>> + ext2fs_dirent_name_len(prev->dir)))
>>> continue;
>>> +
^^^^^^^
>>
>> noise.
>
> Could you please be more specific?
the patch is adding an empty line for no reason.
>
> Arnaud
>
>>
>> Other than that, I think this is still good.
>>
>>> pctx.dirent = ent->dir;
>>> if ((ent->dir->inode == prev->dir->inode) &&
>>> fix_problem(ctx, PR_2_DUPLICATE_DIRENT, &pctx)) {
>>> @@ -426,10 +475,11 @@ static int duplicate_search_and_fix(e2fsck_t ctx, ext2_filsys fs,
>>> mutate_name(new_name, &new_len);
>>> for (j=0; j < fd->num_array; j++) {
>>> if ((i==j) ||
>>> - (new_len !=
>>> - (unsigned) ext2fs_dirent_name_len(fd->harray[j].dir)) ||
>>> - memcmp(new_name, fd->harray[j].dir->name, new_len))
>>> + !same_name(cmp_ctx, new_name, new_len,
>>> + fd->harray[j].dir->name,
>>> + ext2fs_dirent_name_len(fd->harray[j].dir))) {
>>> continue;
>>> + }
>>> mutate_name(new_name, &new_len);
>>>
>>> j = -1;
>>> @@ -894,6 +944,7 @@ errcode_t e2fsck_rehash_dir(e2fsck_t ctx, ext2_ino_t ino,
>>> struct fill_dir_struct fd = { NULL, NULL, 0, 0, 0, NULL,
>>> 0, 0, 0, 0, 0, 0 };
>>> struct out_dir outdir = { 0, 0, 0, 0 };
>>> + struct name_cmp_ctx name_cmp_ctx = {0, NULL};
>>>
>>> e2fsck_read_inode(ctx, ino, &inode, "rehash_dir");
>>>
>>> @@ -921,6 +972,11 @@ errcode_t e2fsck_rehash_dir(e2fsck_t ctx, ext2_ino_t ino,
>>> fd.compress = 1;
>>> fd.parent = 0;
>>>
>>> + if (fs->encoding && (inode.i_flags & EXT4_CASEFOLD_FL)) {
>>> + name_cmp_ctx.casefold = 1;
>>> + name_cmp_ctx.tbl = fs->encoding;
>>> + }
>>> +
>>> retry_nohash:
>>> /* Read in the entire directory into memory */
>>> retval = ext2fs_block_iterate3(fs, ino, 0, 0,
>>> @@ -949,16 +1005,16 @@ retry_nohash:
>>> /* Sort the list */
>>> resort:
>>> if (fd.compress && fd.num_array > 1)
>>> - qsort(fd.harray+2, fd.num_array-2, sizeof(struct hash_entry),
>>> - hash_cmp);
>>> + qsort_r(fd.harray+2, fd.num_array-2, sizeof(struct hash_entry),
>>> + hash_cmp, &name_cmp_ctx);
>>> else
>>> - qsort(fd.harray, fd.num_array, sizeof(struct hash_entry),
>>> - hash_cmp);
>>> + qsort_r(fd.harray, fd.num_array, sizeof(struct hash_entry),
>>> + hash_cmp, &name_cmp_ctx);
>>>
>>> /*
>>> * Look for duplicates
>>> */
>>> - if (duplicate_search_and_fix(ctx, fs, ino, &fd))
>>> + if (duplicate_search_and_fix(ctx, fs, ino, &fd, &name_cmp_ctx))
>>> goto resort;
>>>
>>> if (ctx->options & E2F_OPT_NO) {
>>
--
Gabriel Krisman Bertazi
next prev parent reply other threads:[~2020-12-15 17:36 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-10 15:03 [PATCH RESEND v2 00/12] e2fsprogs: improve case-insensitive fs Arnaud Ferraris
2020-12-10 15:03 ` [PATCH RESEND v2 01/12] tune2fs: Allow enabling casefold feature after fs creation Arnaud Ferraris
2021-01-27 22:42 ` Theodore Ts'o
2020-12-10 15:03 ` [PATCH RESEND v2 02/12] tune2fs: Fix casefold+encrypt error message Arnaud Ferraris
2021-01-27 22:46 ` Theodore Ts'o
2020-12-10 15:03 ` [PATCH RESEND v2 03/12] ext2fs: Add method to validate casefolded strings Arnaud Ferraris
2021-01-28 2:48 ` Theodore Ts'o
2020-12-10 15:03 ` [PATCH RESEND v2 04/12] ext2fs: Implement faster CI comparison of strings Arnaud Ferraris
2021-01-28 2:49 ` Theodore Ts'o
2020-12-10 15:03 ` [PATCH RESEND v2 05/12] e2fsck: add new problem for casefolded name check Arnaud Ferraris
2020-12-10 20:36 ` Gabriel Krisman Bertazi
2020-12-10 20:38 ` Gabriel Krisman Bertazi
2020-12-10 15:03 ` [PATCH RESEND v2 06/12] e2fsck: Fix entries with invalid encoded characters Arnaud Ferraris
2020-12-10 20:51 ` Gabriel Krisman Bertazi
2020-12-15 17:16 ` Arnaud Ferraris
2020-12-10 15:03 ` [PATCH RESEND v2 07/12] e2fsck: Support casefold directories when rehashing Arnaud Ferraris
2020-12-10 20:53 ` Gabriel Krisman Bertazi
2020-12-15 17:17 ` Arnaud Ferraris
2020-12-15 17:34 ` Gabriel Krisman Bertazi [this message]
2020-12-10 15:03 ` [PATCH RESEND v2 08/12] dict: Support comparison with context Arnaud Ferraris
2020-12-10 15:03 ` [PATCH RESEND v2 09/12] e2fsck: Detect duplicated casefolded direntries for rehash Arnaud Ferraris
2020-12-10 15:03 ` [PATCH RESEND v2 10/12] e2fsck: Add option to force encoded filename verification Arnaud Ferraris
2020-12-10 20:48 ` Gabriel Krisman Bertazi
2020-12-10 15:03 ` [PATCH RESEND v2 11/12] e2fsck.8.in: Document check_encoding extended option Arnaud Ferraris
2020-12-10 15:03 ` [PATCH RESEND v2 12/12] tests: f_bad_fname: Test fixes of invalid filenames and duplicates Arnaud Ferraris
2021-01-28 2:52 ` [PATCH RESEND v2 00/12] e2fsprogs: improve case-insensitive fs Theodore Ts'o
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r1nrt1l6.fsf@collabora.com \
--to=krisman@collabora.com \
--cc=arnaud.ferraris@collabora.com \
--cc=drosen@google.com \
--cc=ebiggers@kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.