From patchwork Tue Feb 20 08:52:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Hristev X-Patchwork-Id: 203489 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp271427dyc; Tue, 20 Feb 2024 00:57:30 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXYHp2aCmJlywdZpfv7xpQqXcWGY2PNqt/gOTCnWmCXcnZZcK/0jTq7IbvTu9gisCHiDKg9ibaJGLopgmefLqBOfREsrQ== X-Google-Smtp-Source: AGHT+IGyN2q0MG5mTgjojfPm7YX3R+N4Q0wDo0njnyCbXuTAn6C3mEI51bpsEJQsWVP0jyFwS7lQ X-Received: by 2002:aa7:d98d:0:b0:564:5ed7:2851 with SMTP id u13-20020aa7d98d000000b005645ed72851mr4435137eds.35.1708419450291; Tue, 20 Feb 2024 00:57:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708419450; cv=pass; d=google.com; s=arc-20160816; b=ud4KhOvnGtFtr40IprEexeLMxG1WIEOBPrT7rB+end2g91aSaUiMcrMY3PGCr9kPB2 P9z2tf8HnO/KzdzvkN6ZkuTEwHmK3bRBp04TxBu9yU46tmf+P3bOJFd5lUT87Obb9RHD KELnuN8ny6Z3+J8CZpToHNjQ1RnGxSTedS6Vk3UZxMmW5o8T5bKRpYUo9SQJQ1apIx0Q AN208FlpbpwK69M/BVopc/4ZvivVEkQ9QvCOpWu69FuQTQIxSOj9cbs6oAeAmA21MfZn PfJ+2g1PMsSlSCeTAyEHeknI4oenZyvSzgYCCpdGFdcLvojbwIUEAfwIIWNJfzvqe2Ew +Qqg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=mUH8Ldjjxi8it9eaRNAUP8jiOKNg7HpR2OKWq4ySMwo=; fh=YX4HbHS7wMJfdu6Xp+2MgHIyDiEardnLcvtWgzaTy/w=; b=wgy+6l9NM/sTT982WUWCmyIfj9t19bA7iD/irptcKArmqtpjgTqLEL/+57jiQCYXVd dJ8Ne8lI0XpgoaXN9IWy+eWStjfcATof0vVf/pnN/FokHYtzh8OytoHmslvNEdjMn3b4 DIKBc467IVair4xV4Gv7ThVzukqMQWNNHFrYn6NSc486gQv6rMX/0llmAZ6vFS6e0sFj Bb0l+Y8jPoShKyyISAjTH0blhadIZp2ezltVUal2z20lE3ucfOCjAP7DK5rEAYz+UCNg 5ltwqki7b9rg+Mr5jPAMGt9PsBaF3XYnEWfUI/oJeqhjvoKYddQ2NQMqjmi81AK9fVC+ BkFQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="OQGo5d/O"; arc=pass (i=1 spf=pass spfdomain=collabora.com dkim=pass dkdomain=collabora.com dmarc=pass fromdomain=collabora.com); spf=pass (google.com: domain of linux-kernel+bounces-72616-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-72616-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id u19-20020a50a413000000b005644211a4c8si2453112edb.689.2024.02.20.00.57.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 00:57:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-72616-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="OQGo5d/O"; arc=pass (i=1 spf=pass spfdomain=collabora.com dkim=pass dkdomain=collabora.com dmarc=pass fromdomain=collabora.com); spf=pass (google.com: domain of linux-kernel+bounces-72616-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-72616-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id BE61C1F220B7 for ; Tue, 20 Feb 2024 08:57:29 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 872FF60DD8; Tue, 20 Feb 2024 08:53:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="OQGo5d/O" Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 86A28657CD; Tue, 20 Feb 2024 08:53:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708419192; cv=none; b=j+WVTDdRpj//R/vujiYuZ2gZWlTKpD2XKKg8bc9ObwLAJiV6VVJFL4FoLn/JWp7dyFUojuJo02bLc3ojOpZt1wlWkTQpCeWeRrBrJ3moP2JXJvHBUZrZW7bQh9diq6Jf+8e2dZACE/68TQU3EvgZ23i0On+KkQmF7huChMAP2Bg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708419192; c=relaxed/simple; bh=dzKZXblpWESFyKaff5lcUS9bN5Ok7BHsB49SOtV2pf4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QDNI8T4oZzjeBJelC8Rz01t5hvTsKrMopHPzQRcC+E1gPbn/NfPJzPZE3cnLq/EbjEzNADFwGQXV31dQ89juBOE8ikZfdMZbuSQo+u6W5teBHsdToTNxKskx1k+8DErbbZZ82t5O1Xf6wYxwJGtEElOUZv/K0AM8G+dseBiIFJI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=OQGo5d/O; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1708419188; bh=dzKZXblpWESFyKaff5lcUS9bN5Ok7BHsB49SOtV2pf4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OQGo5d/OjWFVI7q4Vh95ONAjcR0hM1r3UaBTQIWs6xL6Z9omLgKHkJIwqm/syKG9q aY2J95G6+gmbgtjx056voadQsqKItl55ujnixeWnO92C2GmIV70w8zTZZAqwp0RVQP TldUO99vkAa3wNsQMJpKZc4u0jAAEx0yeyKG5174M7dAku94kUb8wFKexA2IzpX8LD AZmnoqXDJJQClOCskOqGERvak/dGwAU6QycUijS8TCUw8S1Elq5z5Lt8Wkz2iLu6Vf RlyuPOMdilVMEFieVY4xi0+fiVdERIfg14r5Z7aKiHJZBefDAYB0dRk1PYO6dzpQSP 7Rh3gGh+7FyWw== Received: from eugen-station.. (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ehristev) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 0E2F93782093; Tue, 20 Feb 2024 08:53:04 +0000 (UTC) From: Eugen Hristev To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, jaegeuk@kernel.org, chao@kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel@collabora.com, eugen.hristev@collabora.com, viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz, krisman@suse.de, Gabriel Krisman Bertazi , Eric Biggers Subject: [PATCH v12 5/8] f2fs: Reuse generic_ci_match for ci comparisons Date: Tue, 20 Feb 2024 10:52:32 +0200 Message-Id: <20240220085235.71132-6-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240220085235.71132-1-eugen.hristev@collabora.com> References: <20240220085235.71132-1-eugen.hristev@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791407633107349111 X-GMAIL-MSGID: 1791407633107349111 From: Gabriel Krisman Bertazi Now that ci_match is part of libfs, make f2fs reuse it instead of having a different implementation. Reviewed-by: Chao Yu Reviewed-by: Eric Biggers Signed-off-by: Gabriel Krisman Bertazi Signed-off-by: Eugen Hristev --- fs/f2fs/dir.c | 58 ++++----------------------------------------------- 1 file changed, 4 insertions(+), 54 deletions(-) diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index f5b65cf36393..7953322b9b9e 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -185,58 +185,6 @@ static struct f2fs_dir_entry *find_in_block(struct inode *dir, return f2fs_find_target_dentry(&d, fname, max_slots); } -#if IS_ENABLED(CONFIG_UNICODE) -/* - * Test whether a case-insensitive directory entry matches the filename - * being searched for. - * - * Returns 1 for a match, 0 for no match, and -errno on an error. - */ -static int f2fs_match_ci_name(const struct inode *dir, const struct qstr *name, - const u8 *de_name, u32 de_name_len) -{ - const struct super_block *sb = dir->i_sb; - const struct unicode_map *um = sb->s_encoding; - struct fscrypt_str decrypted_name = FSTR_INIT(NULL, de_name_len); - struct qstr entry = QSTR_INIT(de_name, de_name_len); - int res; - - if (IS_ENCRYPTED(dir)) { - const struct fscrypt_str encrypted_name = - FSTR_INIT((u8 *)de_name, de_name_len); - - if (WARN_ON_ONCE(!fscrypt_has_encryption_key(dir))) - return -EINVAL; - - decrypted_name.name = kmalloc(de_name_len, GFP_KERNEL); - if (!decrypted_name.name) - return -ENOMEM; - res = fscrypt_fname_disk_to_usr(dir, 0, 0, &encrypted_name, - &decrypted_name); - if (res < 0) - goto out; - entry.name = decrypted_name.name; - entry.len = decrypted_name.len; - } - - res = utf8_strncasecmp_folded(um, name, &entry); - /* - * In strict mode, ignore invalid names. In non-strict mode, - * fall back to treating them as opaque byte sequences. - */ - if (res < 0 && !sb_has_strict_encoding(sb)) { - res = name->len == entry.len && - memcmp(name->name, entry.name, name->len) == 0; - } else { - /* utf8_strncasecmp_folded returns 0 on match */ - res = (res == 0); - } -out: - kfree(decrypted_name.name); - return res; -} -#endif /* CONFIG_UNICODE */ - static inline int f2fs_match_name(const struct inode *dir, const struct f2fs_filename *fname, const u8 *de_name, u32 de_name_len) @@ -245,8 +193,10 @@ static inline int f2fs_match_name(const struct inode *dir, #if IS_ENABLED(CONFIG_UNICODE) if (fname->cf_name.name) - return f2fs_match_ci_name(dir, &fname->cf_name, - de_name, de_name_len); + return generic_ci_match(dir, fname->usr_fname, + &fname->cf_name, + de_name, de_name_len); + #endif f.usr_fname = fname->usr_fname; f.disk_name = fname->disk_name;