leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

btrfs: remove dead code from btrfs_get_extent

Browse Source 
Due to new_inline logic, the create == 0 is always true at this
point in the code, so the create != 0 branch can be removed.

Signed-off-by: Edmund Nadolski <enadolski@suse.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Edmund Nadolski 2017-11-20 13:24:49 -07:00 committed by David Sterba
parent 41a1eadad7
commit bf46f52db9
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fs/btrfs/inode.c
View File

@ -6946,7 +6946,6 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode,
struct btrfs_trans_handle *trans = NULL; struct btrfs_trans_handle *trans = NULL;
const bool new_inline = !page || create; const bool new_inline = !page || create;
again:
read_lock(&em_tree->lock); read_lock(&em_tree->lock);
em = lookup_extent_mapping(em_tree, start, len); em = lookup_extent_mapping(em_tree, start, len);
if (em) if (em)
@ -7087,7 +7086,7 @@ next:
em->orig_block_len = em->len; em->orig_block_len = em->len;
em->orig_start = em->start; em->orig_start = em->start;
ptr = btrfs_file_extent_inline_start(item) + extent_offset; ptr = btrfs_file_extent_inline_start(item) + extent_offset;
if (create == 0 && !PageUptodate(page)) { if (!PageUptodate(page)) {
if (btrfs_file_extent_compression(leaf, item) != if (btrfs_file_extent_compression(leaf, item) !=
BTRFS_COMPRESS_NONE) { BTRFS_COMPRESS_NONE) {
ret = uncompress_inline(path, page, pg_offset, ret = uncompress_inline(path, page, pg_offset,
@ -7108,25 +7107,6 @@ next:
kunmap(page); kunmap(page);
} }
flush_dcache_page(page); flush_dcache_page(page);
} else if (create && PageUptodate(page)) {
BUG();
if (!trans) {
kunmap(page);
free_extent_map(em);
em = NULL;
btrfs_release_path(path);
trans = btrfs_join_transaction(root);
if (IS_ERR(trans))
return ERR_CAST(trans);
goto again;
}
map = kmap(page);
write_extent_buffer(leaf, map + pg_offset, ptr,
copy_size);
kunmap(page);
btrfs_mark_buffer_dirty(leaf);
} }
set_extent_uptodate(io_tree, em->start, set_extent_uptodate(io_tree, em->start,
extent_map_end(em) - 1, NULL, GFP_NOFS); extent_map_end(em) - 1, NULL, GFP_NOFS);