From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D4C14C6FA8D for ; Tue, 13 Sep 2022 23:59:26 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1oYFoM-0006PI-FH; Tue, 13 Sep 2022 23:59:26 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1oYFoJ-0006Oh-FR for linux-f2fs-devel@lists.sourceforge.net; Tue, 13 Sep 2022 23:59:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=IthQB+mtGuM5QYdAz0buDSFRWXH53Zpia5+kSOJXueQ=; b=cSVryrTwMVbbjUJz8WO/JXK9co y+NT48qr1CUGMXyck6l0sB7EuYWVSqP/M98uy7qlqSfnKGrPYf2+iP7JPzh9EXUhIAvpKNg4gp2fd 5DWwRjLAPpBvUOL/JqzyCW1ZoYL7ULq6Lxorm0ML/3BeFPfm0dJQWZ82oanIuJ5KkaS4=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=IthQB+mtGuM5QYdAz0buDSFRWXH53Zpia5+kSOJXueQ=; b=cCvma3cgclQzBrUMsAYXWdNFFb 0s5Mgyc8hPIi/ldApu39Ru2NIa/hA09ueUAnOrUyOVXXpNnZ8t5CeECngKRdUMo9OGCValYRdKnmw UaZ6bW87bDbxdJi13xi0q+R+gWM+AoHG2trgxDHCLP2zz2glO/x76SWDOWH+7vuvXUgc=; Received: from madras.collabora.co.uk ([46.235.227.172]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1oYFoI-00035q-57 for linux-f2fs-devel@lists.sourceforge.net; Tue, 13 Sep 2022 23:59:22 +0000 Received: from localhost (modemcable141.102-20-96.mc.videotron.ca [96.20.102.141]) (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: krisman) by madras.collabora.co.uk (Postfix) with ESMTPSA id 2E826660201D; Wed, 14 Sep 2022 00:42:19 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1663112539; bh=faqmgQTGUmRIw+3ntvGWmd2h/vTEsHbxKjStw+7u9dI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L9oBiu9VSRpXLsF5E+Ed1qRiI5VHFd7Q0ILfzK7TE1D/BeyubpPhS+7O6/DwpdLX6 9sFUlnJiAB/QJ/3ER0EZ5Qtx2tVlBuzOs8AhMnQOrwHoC3Iu+ZWOdpU7+xAgLuu+XG XZ4tXJzrIySQ6Q8nXKjrjZ6iIh79YdNe6cpwukIYFrGLjzLQ0Eg33aSUB4+yd6KfZ+ X3GYB6X1ZY8WJMriZ94BnphSzkN/y9WR6mH+aM8Sh0A296LAKRFOGyuSH+9Tb+2AzN wiV9L3zn1WaKtA/umjXzAgmnhzq+2vkzJwSNUaf0nN8AuqFioAqdt9aNu6uobyq/Z2 TClDgBeZY5SmQ== From: Gabriel Krisman Bertazi To: tytso@mit.edu, adilger.kernel@dilger.ca, jaegeuk@kernel.org, ebiggers@kernel.org Date: Tue, 13 Sep 2022 19:41:47 -0400 Message-Id: <20220913234150.513075-6-krisman@collabora.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220913234150.513075-1-krisman@collabora.com> References: <20220913234150.513075-1-krisman@collabora.com> MIME-Version: 1.0 X-Headers-End: 1oYFoI-00035q-57 Subject: [f2fs-dev] [PATCH v9 5/8] f2fs: Reuse generic_ci_match for ci comparisons X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel@collabora.com, Eric Biggers , linux-f2fs-devel@lists.sourceforge.net, linux-ext4@vger.kernel.org, Gabriel Krisman Bertazi Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net 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 --- Changes since v3: - Drop cast (eric) - fix unused variable iff !CONFIG_UNICODE (lkp) --- 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 98db333a1338..bce3727de3c9 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -218,58 +218,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) @@ -278,8 +226,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; -- 2.37.3 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel