Commit 6b5b7a41 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by David Sterba
Browse files

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: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent f716fa47

fs/btrfs/extent_io.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */