]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ext4: fix an IS_ERR() vs NULL check
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 23 Oct 2020 11:22:32 +0000 (14:22 +0300)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 17 Dec 2020 18:30:32 +0000 (13:30 -0500)
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
fs/ext4/extents.c

index 90ba74c146949a091b8d833ee27e7866927d5b6e..3960b7ec3ab770e817a92d38a9d42cfe8ec77bca 100644 (file)
@@ -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;