All of lore.kernel.org
 help / color / mirror / Atom feed
From: Gabriel Krisman Bertazi <krisman@collabora.com>
To: tytso@mit.edu, adilger.kernel@dilger.ca, jaegeuk@kernel.org
Cc: linux-ext4@vger.kernel.org,
	linux-f2fs-devel@lists.sourceforge.net, ebiggers@kernel.org,
	Gabriel Krisman Bertazi <krisman@collabora.com>,
	kernel@collabora.com
Subject: [PATCH v3 4/7] ext4: Simplify hash check on ext4_match
Date: Fri, 29 Apr 2022 14:27:25 -0400	[thread overview]
Message-ID: <20220429182728.14008-5-krisman@collabora.com> (raw)
In-Reply-To: <20220429182728.14008-1-krisman@collabora.com>

The existence of fname->cf_name.name requires s_encoding & IS_CASEFOLDED,
therefore this can be simplified.

Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
---
 fs/ext4/namei.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 5102652b5af4..e450e52eef48 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1440,19 +1440,13 @@ static bool ext4_match(struct inode *parent,
 #endif
 
 #if IS_ENABLED(CONFIG_UNICODE)
-	if (parent->i_sb->s_encoding && IS_CASEFOLDED(parent) &&
-	    (!IS_ENCRYPTED(parent) || fscrypt_has_encryption_key(parent))) {
-		if (fname->cf_name.name) {
-			if (IS_ENCRYPTED(parent)) {
-				if (fname->hinfo.hash != EXT4_DIRENT_HASH(de) ||
-					fname->hinfo.minor_hash !=
-						EXT4_DIRENT_MINOR_HASH(de)) {
-
-					return false;
-				}
-			}
-		}
+	if (IS_ENCRYPTED(parent) && fname->cf_name.name) {
+		if (fname->hinfo.hash != EXT4_DIRENT_HASH(de) ||
+		    fname->hinfo.minor_hash != EXT4_DIRENT_MINOR_HASH(de))
+			return false;
+	}
 
+	if (parent->i_sb->s_encoding && IS_CASEFOLDED(parent)) {
 		u.folded_name = &fname->cf_name;
 		u.usr_name = fname->usr_fname;
 
-- 
2.35.1


WARNING: multiple messages have this Message-ID (diff)
From: Gabriel Krisman Bertazi <krisman@collabora.com>
To: tytso@mit.edu, adilger.kernel@dilger.ca, jaegeuk@kernel.org
Cc: ebiggers@kernel.org, linux-ext4@vger.kernel.org,
	Gabriel Krisman Bertazi <krisman@collabora.com>,
	kernel@collabora.com, linux-f2fs-devel@lists.sourceforge.net
Subject: [f2fs-dev] [PATCH v3 4/7] ext4: Simplify hash check on ext4_match
Date: Fri, 29 Apr 2022 14:27:25 -0400	[thread overview]
Message-ID: <20220429182728.14008-5-krisman@collabora.com> (raw)
In-Reply-To: <20220429182728.14008-1-krisman@collabora.com>

The existence of fname->cf_name.name requires s_encoding & IS_CASEFOLDED,
therefore this can be simplified.

Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
---
 fs/ext4/namei.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 5102652b5af4..e450e52eef48 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1440,19 +1440,13 @@ static bool ext4_match(struct inode *parent,
 #endif
 
 #if IS_ENABLED(CONFIG_UNICODE)
-	if (parent->i_sb->s_encoding && IS_CASEFOLDED(parent) &&
-	    (!IS_ENCRYPTED(parent) || fscrypt_has_encryption_key(parent))) {
-		if (fname->cf_name.name) {
-			if (IS_ENCRYPTED(parent)) {
-				if (fname->hinfo.hash != EXT4_DIRENT_HASH(de) ||
-					fname->hinfo.minor_hash !=
-						EXT4_DIRENT_MINOR_HASH(de)) {
-
-					return false;
-				}
-			}
-		}
+	if (IS_ENCRYPTED(parent) && fname->cf_name.name) {
+		if (fname->hinfo.hash != EXT4_DIRENT_HASH(de) ||
+		    fname->hinfo.minor_hash != EXT4_DIRENT_MINOR_HASH(de))
+			return false;
+	}
 
+	if (parent->i_sb->s_encoding && IS_CASEFOLDED(parent)) {
 		u.folded_name = &fname->cf_name;
 		u.usr_name = fname->usr_fname;
 
-- 
2.35.1



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

  parent reply	other threads:[~2022-04-29 18:27 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-29 18:27 [PATCH v3 0/7] Clean up the case-insenstive lookup path Gabriel Krisman Bertazi
2022-04-29 18:27 ` [f2fs-dev] " Gabriel Krisman Bertazi
2022-04-29 18:27 ` [PATCH v3 1/7] ext4: Match the f2fs ci_compare implementation Gabriel Krisman Bertazi
2022-04-29 18:27   ` [f2fs-dev] " Gabriel Krisman Bertazi
2022-05-09 18:08   ` kernel test robot
2022-05-09 18:08     ` [f2fs-dev] " kernel test robot
2022-04-29 18:27 ` [PATCH v3 2/7] ext4: Simplify the handling of cached insensitive names Gabriel Krisman Bertazi
2022-04-29 18:27   ` [f2fs-dev] " Gabriel Krisman Bertazi
2022-04-29 18:27 ` [PATCH v3 3/7] ext4: Implement ci comparison using unicode_name Gabriel Krisman Bertazi
2022-04-29 18:27   ` [f2fs-dev] " Gabriel Krisman Bertazi
2022-05-09 20:13   ` kernel test robot
2022-05-09 20:13     ` kernel test robot
2022-04-29 18:27 ` Gabriel Krisman Bertazi [this message]
2022-04-29 18:27   ` [f2fs-dev] [PATCH v3 4/7] ext4: Simplify hash check on ext4_match Gabriel Krisman Bertazi
2022-04-29 18:27 ` [PATCH v3 5/7] ext4: Log error when lookup of encoded dentry fails Gabriel Krisman Bertazi
2022-04-29 18:27   ` [f2fs-dev] " Gabriel Krisman Bertazi
2022-04-29 18:27 ` [PATCH v3 6/7] ext4: Move ext4_match_ci into libfs Gabriel Krisman Bertazi
2022-04-29 18:27   ` [f2fs-dev] " Gabriel Krisman Bertazi
2022-04-29 18:27 ` [PATCH v3 7/7] f2fs: Reuse generic_ci_match for ci comparisons Gabriel Krisman Bertazi
2022-04-29 18:27   ` [f2fs-dev] " Gabriel Krisman Bertazi
2022-05-09 22:29   ` kernel test robot
2022-05-09 22:29     ` [f2fs-dev] " kernel test robot

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=20220429182728.14008-5-krisman@collabora.com \
    --to=krisman@collabora.com \
    --cc=adilger.kernel@dilger.ca \
    --cc=ebiggers@kernel.org \
    --cc=jaegeuk@kernel.org \
    --cc=kernel@collabora.com \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-f2fs-devel@lists.sourceforge.net \
    --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.