On 20.11.2017 22:24, Edmund Nadolski wrote:
> 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 <enadol...@suse.com>
Reviewed-by: Nikolay Borisov <nbori...@suse.com>
> ---
> fs/btrfs/inode.c | 22 +---------------------
> 1 file changed, 1 insertion(+), 21 deletions(-)
>
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index b6d5d94..0d4a066 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -6957,7 +6957,6 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode
> *inode,
> struct btrfs_trans_handle *trans = NULL;
> const bool new_inline = !page || create;
>
> -again:
> read_lock(&em_tree->lock);
> em = lookup_extent_mapping(em_tree, start, len);
> if (em)
> @@ -7098,7 +7097,7 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode
> *inode,
> em->orig_block_len = em->len;
> em->orig_start = em->start;
> ptr = btrfs_file_extent_inline_start(item) + extent_offset;
> - if (create == 0 && !PageUptodate(page)) {
> + if (!PageUptodate(page)) {
> if (btrfs_file_extent_compression(leaf, item) !=
> BTRFS_COMPRESS_NONE) {
> ret = uncompress_inline(path, page, pg_offset,
> @@ -7119,25 +7118,6 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode
> *inode,
> kunmap(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,
> extent_map_end(em) - 1, NULL, GFP_NOFS);
>
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
