From: Xichao Zhao <zhao.xichao@vivo.com>
Date: Tue, 12 Aug 2025 08:27:09 +0000 (+0800)
Subject: configfs: use PTR_ERR_OR_ZERO() to simplify code
X-Git-Tag: v6.18-rc1~120^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=462272dd734b568f0190d01e24f5257c1a763fae;p=thirdparty%2Flinux.git

configfs: use PTR_ERR_OR_ZERO() to simplify code

Use the standard error pointer macro to shorten the code and simplify.

Signed-off-by: Xichao Zhao <zhao.xichao@vivo.com>
Reviewed-by: Breno Leitao <leitao@debian.org>
Link: https://lore.kernel.org/r/20250812082709.49796-1-zhao.xichao@vivo.com
Signed-off-by: Andreas Hindborg <a.hindborg@kernel.org>
---

diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index f327fbb9a0cae..81f4f06bc87e7 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -1601,10 +1601,7 @@ static int configfs_dir_open(struct inode *inode, struct file *file)
 	err = -ENOENT;
 	if (configfs_dirent_is_ready(parent_sd)) {
 		file->private_data = configfs_new_dirent(parent_sd, NULL, 0, NULL);
-		if (IS_ERR(file->private_data))
-			err = PTR_ERR(file->private_data);
-		else
-			err = 0;
+		err = PTR_ERR_OR_ZERO(file->private_data);
 	}
 	inode_unlock(d_inode(dentry));