diff options
| author | Omar Sandoval <osandov@fb.com> | 2019-12-03 04:34:24 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2020-01-20 18:40:55 +0300 |
| commit | c8b04030c5ec006e161969d77c07fb03a8b67112 (patch) | |
| tree | e9de7952ac041667c78d527ec5676d5a0f0be0f2 /fs/btrfs/extent_io.c | |
| parent | 39b07b5d7072f8e9fd8cc2f840d3749f86699bbb (diff) | |
| download | linux-c8b04030c5ec006e161969d77c07fb03a8b67112.tar.xz | |
btrfs: simplify compressed/inline check in __extent_writepage_io()
Commit 7087a9d8db88 ("btrfs: Remove
extent_io_ops::writepage_end_io_hook") left this logic in a confusing
state. Simplify it.
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Omar Sandoval <osandov@fb.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/extent_io.c')
| -rw-r--r-- | fs/btrfs/extent_io.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index bbfb102d65b8..394beb474a69 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -3492,22 +3492,11 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode, */ if (compressed || block_start == EXTENT_MAP_HOLE || block_start == EXTENT_MAP_INLINE) { - /* - * end_io notification does not happen here for - * compressed extents - */ - if (!compressed) - btrfs_writepage_endio_finish_ordered(page, cur, - cur + iosize - 1, - 1); - else if (compressed) { - /* we don't want to end_page_writeback on - * a compressed extent. this happens - * elsewhere - */ + if (compressed) nr++; - } - + else + btrfs_writepage_endio_finish_ordered(page, cur, + cur + iosize - 1, 1); cur += iosize; pg_offset += iosize; continue; |