From: Daniel Rosenberg <drosen@google.com>
To: Eric Biggers <ebiggers@kernel.org>
Cc: "Theodore Ts'o" <tytso@mit.edu>,
linux-ext4@vger.kernel.org, Jaegeuk Kim <jaegeuk@kernel.org>,
Chao Yu <chao@kernel.org>,
linux-f2fs-devel@lists.sourceforge.net,
linux-fscrypt@vger.kernel.org,
Alexander Viro <viro@zeniv.linux.org.uk>,
Andreas Dilger <adilger.kernel@dilger.ca>,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
Gabriel Krisman Bertazi <krisman@collabora.com>,
kernel-team@android.com
Subject: Re: [PATCH v11 2/4] fs: Add standard casefolding support
Date: Wed, 8 Jul 2020 01:36:33 -0700 [thread overview]
Message-ID: <CA+PiJmQP+kJQeCZ0LFqRcN6JYWF6pAUHaTnFOThmDLtLTveOXg@mail.gmail.com> (raw)
In-Reply-To: <20200708041230.GL839@sol.localdomain>
On Tue, Jul 7, 2020 at 9:12 PM Eric Biggers <ebiggers@kernel.org> wrote:
>
> On Tue, Jul 07, 2020 at 08:05:50PM -0700, Daniel Rosenberg wrote:
> > +/**
> > + * generic_ci_d_compare - generic d_compare implementation for casefolding filesystems
> > + * @dentry: dentry whose name we are checking against
> > + * @len: len of name of dentry
> > + * @str: str pointer to name of dentry
> > + * @name: Name to compare against
> > + *
> > + * Return: 0 if names match, 1 if mismatch, or -ERRNO
> > + */
> > +int generic_ci_d_compare(const struct dentry *dentry, unsigned int len,
> > + const char *str, const struct qstr *name)
> > +{
> > + const struct dentry *parent = READ_ONCE(dentry->d_parent);
> > + const struct inode *inode = READ_ONCE(parent->d_inode);
>
> How about calling the 'inode' variable 'dir' instead?
>
> That would help avoid confusion about what is the directory and what is a file
> in the directory.
>
> Likewise in generic_ci_d_hash().
>
> > +/**
> > + * generic_ci_d_hash - generic d_hash implementation for casefolding filesystems
> > + * @dentry: dentry whose name we are hashing
>
> This comment for @dentry needs to be updated.
>
> It's the parent dentry, not the dentry whose name we are hashing.
>
> > + * @str: qstr of name whose hash we should fill in
> > + *
> > + * Return: 0 if hash was successful, or -ERRNO
>
> As I mentioned on v9, this can also return 0 if the hashing was not done because
> it wants to fallback to the standard hashing. Can you please fix the comment?
>
> > +int generic_ci_d_hash(const struct dentry *dentry, struct qstr *str)
> > +{
> > + const struct inode *inode = READ_ONCE(dentry->d_inode);
> > + struct super_block *sb = dentry->d_sb;
> > + const struct unicode_map *um = sb->s_encoding;
> > + int ret = 0;
> > +
> > + if (!inode || !needs_casefold(inode))
> > + return 0;
> > +
> > + ret = utf8_casefold_hash(um, dentry, str);
> > + if (ret < 0)
> > + goto err;
> > +
> > + return 0;
> > +err:
> > + if (sb_has_strict_encoding(sb))
> > + ret = -EINVAL;
> > + else
> > + ret = 0;
> > + return ret;
> > +}
>
> On v9, Gabriel suggested simplifying this to:
>
> ret = utf8_casefold_hash(um, dentry, str);
> if (ret < 0 && sb_has_enc_strict_mode(sb))
> return -EINVAL;
> return 0;
>
> Any reason not to do that?
>
> - Eric
Guh, I remember making those changes, must've lost them in a rebase :(
I'll resend shortly.
-Daniel
next prev parent reply other threads:[~2020-07-08 8:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-08 3:05 [PATCH v11 0/4] Prepare for upcoming Casefolding/Encryption patches Daniel Rosenberg
2020-07-08 3:05 ` [PATCH v11 1/4] unicode: Add utf8_casefold_hash Daniel Rosenberg
2020-07-08 3:05 ` [PATCH v11 2/4] fs: Add standard casefolding support Daniel Rosenberg
2020-07-08 4:12 ` Eric Biggers
2020-07-08 8:36 ` Daniel Rosenberg [this message]
2020-07-08 3:05 ` [PATCH v11 3/4] f2fs: Use generic " Daniel Rosenberg
2020-07-08 3:05 ` [PATCH v11 4/4] ext4: " Daniel Rosenberg
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=CA+PiJmQP+kJQeCZ0LFqRcN6JYWF6pAUHaTnFOThmDLtLTveOXg@mail.gmail.com \
--to=drosen@google.com \
--cc=adilger.kernel@dilger.ca \
--cc=chao@kernel.org \
--cc=ebiggers@kernel.org \
--cc=jaegeuk@kernel.org \
--cc=kernel-team@android.com \
--cc=krisman@collabora.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fscrypt@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).