diff options
| author | Dan Carpenter | 2017-04-11 10:57:15 +0200 |
|---|---|---|
| committer | David Sterba | 2017-04-18 14:07:27 +0200 |
| commit | 9986277e0e4ce10fd37bf853fe22ba429a967a45 (patch) | |
| tree | 86825014e730ea7a59512c8f8526b260ba00cf2a /fs/btrfs/file.c | |
| parent | btrfs: qgroup: Fix qgroup corruption caused by inode_cache mount option (diff) | |
| download | kernel-qcow2-linux-9986277e0e4ce10fd37bf853fe22ba429a967a45.tar.gz kernel-qcow2-linux-9986277e0e4ce10fd37bf853fe22ba429a967a45.tar.xz kernel-qcow2-linux-9986277e0e4ce10fd37bf853fe22ba429a967a45.zip | |
Btrfs: handle only applicable errors returned by btrfs_get_extent
btrfs_get_extent() never returns NULL pointers, so this code introduces
a static checker warning.
The btrfs_get_extent() is a bit complex, but trust me that it doesn't
return NULLs and also if it did we would trigger the BUG_ON(!em) before
the last return statement.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
[ updated subject ]
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 520cb7230b2d..3cedbfd08a3a 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -2342,13 +2342,8 @@ static int find_first_non_hole(struct inode *inode, u64 *start, u64 *len) int ret = 0; em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, *start, *len, 0); - if (IS_ERR_OR_NULL(em)) { - if (!em) - ret = -ENOMEM; - else - ret = PTR_ERR(em); - return ret; - } + if (IS_ERR(em)) + return PTR_ERR(em); /* Hole or vacuum extent(only exists in no-hole mode) */ if (em->block_start == EXTENT_MAP_HOLE) { @@ -2835,11 +2830,8 @@ static long btrfs_fallocate(struct file *file, int mode, while (1) { em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, cur_offset, alloc_end - cur_offset, 0); - if (IS_ERR_OR_NULL(em)) { - if (!em) - ret = -ENOMEM; - else - ret = PTR_ERR(em); + if (IS_ERR(em)) { + ret = PTR_ERR(em); break; } last_byte = min(extent_map_end(em), alloc_end); |