From: Nikolay Borisov <nborisov@suse.com>
Date: Fri, 1 Dec 2017 09:19:43 +0000 (+0200)
Subject: btrfs: remove redundant check in btrfs_get_extent_fiemap
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bf8d32b9b3c5fb183aa4ac5cb7bae9580dcb0dfb;p=linux.git

btrfs: remove redundant check in btrfs_get_extent_fiemap

Before returning hole_em in btrfs_get_fiemap_extent we check if it's different
than null. However, by the time this null check is triggered we already know
hole_em is not null because it means it points to the em we found and it
has already been dereferenced.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
---

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 8b6c59a068d26..034d7333b14dd 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -7305,7 +7305,7 @@ struct extent_map *btrfs_get_extent_fiemap(struct btrfs_inode *inode,
 			em->block_start = EXTENT_MAP_DELALLOC;
 			em->block_len = found;
 		}
-	} else if (hole_em) {
+	} else {
 		return hole_em;
 	}
 out: