diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-03 13:13:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-03 13:13:17 -0700 |
| commit | 2c1ef408c2bbadd814cc0b1d38d02da42f759584 (patch) | |
| tree | 61b478a7839ee3c0fecf75d8abf4b878684c25e1 | |
| parent | 6238729bfce13f94b701766996a5d116d2df8bff (diff) | |
| parent | 462272dd734b568f0190d01e24f5257c1a763fae (diff) | |
Merge tag 'configfs-for-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux
Pull configfs update from Andreas Hindborg:
"Just a very small refactoring to use PTR_ERR_OR_ZERO()"
* tag 'configfs-for-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux:
configfs: use PTR_ERR_OR_ZERO() to simplify code
| -rw-r--r-- | fs/configfs/dir.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c index f327fbb9a0ca..81f4f06bc87e 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)); |