From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 20 Jan 2024 11:20:36 +0000 (-0500)
Subject: get_file_rcu(): no need to check for NULL separately
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=613aee94dddf07de9fde8dd4fcb6e4579cde8a65;p=linux.git

get_file_rcu(): no need to check for NULL separately

IS_ERR(NULL) is false and IS_ERR() already comes with unlikely()...

Reviewed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/file.c b/fs/file.c
index ab38b005633cf..8076aef9c2101 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -920,13 +920,8 @@ struct file *get_file_rcu(struct file __rcu **f)
 		struct file __rcu *file;
 
 		file = __get_file_rcu(f);
-		if (unlikely(!file))
-			return NULL;
-
-		if (unlikely(IS_ERR(file)))
-			continue;
-
-		return file;
+		if (!IS_ERR(file))
+			return file;
 	}
 }
 EXPORT_SYMBOL_GPL(get_file_rcu);