| Message ID | 90e3cf42e593327159cd261d71da2bedb53cc562.1643976372.git.johannes.thumshirn@wdc.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs: stop checking for NULL return from btrfs_get_extent_fiemap() | expand |
On Fri, Feb 04, 2022 at 04:06:27AM -0800, Johannes Thumshirn wrote: > 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. > > Cc: Filipe Manana <fdmanana@suse.com> > Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Reviewed-by: Filipe Manana <fdmanana@suse.com> Looks good, thanks. > --- > fs/btrfs/extent_io.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c > index 409bad3928db..ad3d8e53a75a 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 */ > -- > 2.34.1 >
On Fri, Feb 04, 2022 at 04:06:27AM -0800, Johannes Thumshirn wrote: > 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. > > Cc: Filipe Manana <fdmanana@suse.com> > Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Added to misc-next, thanks.
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 409bad3928db..ad3d8e53a75a 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 */
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. Cc: Filipe Manana <fdmanana@suse.com> Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> --- fs/btrfs/extent_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)