projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8f4bf6e
)
ext4: fix an IS_ERR() vs NULL check
author
Dan Carpenter
<dan.carpenter@oracle.com>
Fri, 23 Oct 2020 11:22:32 +0000
(14:22 +0300)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 30 Dec 2020 10:54:13 +0000
(11:54 +0100)
commit
bc18546bf68e47996a359d2533168d5770a22024
upstream.
The ext4_find_extent() function never returns NULL, it returns error
pointers.
Fixes:
44059e503b03
("ext4: fast commit recovery path")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link:
https://lore.kernel.org/r/20201023112232.GB282278@mwanda
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/ext4/extents.c
patch
|
blob
|
history
diff --git
a/fs/ext4/extents.c
b/fs/ext4/extents.c
index
17d7096
..
12eac88
100644
(file)
--- a/
fs/ext4/extents.c
+++ b/
fs/ext4/extents.c
@@
-5815,8
+5815,8
@@
int ext4_ext_replay_update_ex(struct inode *inode, ext4_lblk_t start,
int ret;
path = ext4_find_extent(inode, start, NULL, 0);
- if (
!path
)
- return
-EINVAL
;
+ if (
IS_ERR(path)
)
+ return
PTR_ERR(path)
;
ex = path[path->p_depth].p_ext;
if (!ex) {
ret = -EFSCORRUPTED;