From 197298a64983e2beaf1a87413daff3044b4f3821 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>

Date: Tue, 17 Mar 2020 22:34:33 +0100

Subject: [Backport 197298a64983] exfat: Simplify exfat_utf8_d_cmp() for code

 points above U+FFFF

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

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 <pali@kernel.org>

Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>

---

 src/namei.c | 9 ++-------

 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/namei.c b/src/namei.c

index a2659a8a68a14273eeff16dd467d771ebe038b43..731da41cabbf7b9dfd38f001fc502573bfd6c078 100644

--- a/src/namei.c

+++ b/src/namei.c

@@ -185,14 +185,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;

 		}

 	}

-- 

2.31.1