From: Johannes Thumshirn Date: Fri, 4 Feb 2022 12:06:27 +0000 (-0800) Subject: btrfs: stop checking for NULL return from btrfs_get_extent_fiemap() X-Git-Tag: v5.18-rc1~172^2~56 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6b5b7a41d0704f2e3e864b0e4a2539beecefade6;p=linux-2.6-block.git btrfs: stop checking for NULL return from btrfs_get_extent_fiemap() In get_extent_skip_holes() we're checking the return of btrfs_get_extent_fiemap() for an error pointer or NULL, but btrfs_get_extent_fiemap() will never return NULL, only error pointers or a valid extent_map. The other caller of btrfs_get_extent_fiemap(), find_desired_extent(), correctly only checks for error-pointers. Reviewed-by: Filipe Manana Signed-off-by: Johannes Thumshirn Reviewed-by: David Sterba Signed-off-by: David Sterba --- diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 4c91060d103a..6bafdec691eb 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -5390,7 +5390,7 @@ static struct extent_map *get_extent_skip_holes(struct btrfs_inode *inode, break; len = ALIGN(len, sectorsize); em = btrfs_get_extent_fiemap(inode, offset, len); - if (IS_ERR_OR_NULL(em)) + if (IS_ERR(em)) return em; /* if this isn't a hole return it */