From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 17 May 2021 00:19:06 +0000 (-0400)
Subject: d_path: prepend_path() is unlikely to return non-zero
X-Git-Tag: accepted/tizen/unified/20230118.172025~6914^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cf4febc1adc8e5cd11ca3386e1e3ea356e0792f0;p=platform%2Fkernel%2Flinux-rpi.git

d_path: prepend_path() is unlikely to return non-zero

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/d_path.c b/fs/d_path.c
index ba62987..8a9cd44 100644
--- a/fs/d_path.c
+++ b/fs/d_path.c
@@ -187,7 +187,7 @@ char *__d_path(const struct path *path,
 	DECLARE_BUFFER(b, buf, buflen);
 
 	prepend(&b, "", 1);
-	if (prepend_path(path, root, &b) > 0)
+	if (unlikely(prepend_path(path, root, &b) > 0))
 		return NULL;
 	return extract_string(&b);
 }
@@ -199,7 +199,7 @@ char *d_absolute_path(const struct path *path,
 	DECLARE_BUFFER(b, buf, buflen);
 
 	prepend(&b, "", 1);
-	if (prepend_path(path, &root, &b) > 1)
+	if (unlikely(prepend_path(path, &root, &b) > 1))
 		return ERR_PTR(-EINVAL);
 	return extract_string(&b);
 }
@@ -396,7 +396,7 @@ SYSCALL_DEFINE2(getcwd, char __user *, buf, unsigned long, size)
 		DECLARE_BUFFER(b, page, PATH_MAX);
 
 		prepend(&b, "", 1);
-		if (prepend_path(&pwd, &root, &b) > 0)
+		if (unlikely(prepend_path(&pwd, &root, &b) > 0))
 			prepend(&b, "(unreachable)", 13);
 		rcu_read_unlock();