From patchwork Tue Mar 17 22:25:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 11444183 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4E8B892A for ; Tue, 17 Mar 2020 22:26:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E39020754 for ; Tue, 17 Mar 2020 22:26:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584483994; bh=4k6KBBn76eVZsFSeQRaasQ+3DSNYdmTUZZs6bJU4Vhw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Dzo2JUYzK0EzTwqto074r+rIlkAgkAtdWcTqCrZ3MnfH1yrSBtMQ1LnpFekLYYQ3p YXKsUy1apZf62xF1L/XdOe8mdF0lzc70an8hYszM52DXEBQxV6rlg7fnp3OH9Ta7il BvvJyo36nRQwYNPtsAuXZ3B3dgeYgmb0BdgW2ryM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727112AbgCQW0a (ORCPT ); Tue, 17 Mar 2020 18:26:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:35908 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726549AbgCQW0a (ORCPT ); Tue, 17 Mar 2020 18:26:30 -0400 Received: from pali.im (pali.im [31.31.79.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AEB9920770; Tue, 17 Mar 2020 22:26:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584483989; bh=4k6KBBn76eVZsFSeQRaasQ+3DSNYdmTUZZs6bJU4Vhw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kcinbrpGXPhXFPtgVDx67OBRJkkJLC76CkkTiVX7ZDuuRVlJ3EDoPDieDiflWfX5N d9Ehg3RUcXWMGWr1kVLev8heFv0MpmvYyDWpnjqAZwYrOS0FiITSRgc9t0I53ak5Ba 7NcvR2Ma1BHHfUNWD84QKMubI8yeU/ctrGSZzpC8= Received: by pali.im (Postfix) id EAEDC700; Tue, 17 Mar 2020 23:26:27 +0100 (CET) From: =?utf-8?q?Pali_Roh=C3=A1r?= To: Namjae Jeon , Sungjong Seo , Alexander Viro Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] exfat: Simplify exfat_utf8_d_cmp() for code points above U+FFFF Date: Tue, 17 Mar 2020 23:25:53 +0100 Message-Id: <20200317222555.29974-3-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200317222555.29974-1-pali@kernel.org> References: <20200317222555.29974-1-pali@kernel.org> MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org If two Unicode code points represented in UTF-16 are different then also their UTF-32 representation must be different. Therefore conversion from UTF-32 to UTF-16 is not needed. Signed-off-by: Pali Rohár --- fs/exfat/namei.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/fs/exfat/namei.c b/fs/exfat/namei.c index e0ec4ff366f5..f07cab5fcd28 100644 --- a/fs/exfat/namei.c +++ b/fs/exfat/namei.c @@ -179,14 +179,9 @@ static int exfat_utf8_d_cmp(const struct dentry *dentry, unsigned int len, if (u_a <= 0xFFFF && u_b <= 0xFFFF) { if (exfat_toupper(sb, u_a) != exfat_toupper(sb, u_b)) return 1; - } else if (u_a > 0xFFFF && u_b > 0xFFFF) { - if (exfat_low_surrogate(u_a) != - exfat_low_surrogate(u_b) || - exfat_high_surrogate(u_a) != - exfat_high_surrogate(u_b)) - return 1; } else { - return 1; + if (u_a != u_b) + return 1; } }