diff options
author | Filipe Manana <fdmanana@suse.com> | 2014-10-09 16:15:44 -0400 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2014-11-20 20:14:27 -0500 |
commit | c44f649e281e93689827a206653696be9599a320 (patch) | |
tree | 76b30f36b535f504a40f8f87451dc9456f01ef9d /fs/btrfs/inode.c | |
parent | 4bcbb33255131adbe481c0467df26d654ce3bc78 (diff) |
Btrfs: make inode.c:compress_file_range() return void
Its return value is useless, its single caller ignores it and can't do
anything with it anyway, since it's a workqueue task and not the task
calling filemap_fdatawrite_range (writepages) nor filemap_fdatawait_range().
Failure is communicated to such functions via start and end of writeback
with the respective pages tagged with an error and AS_EIO flag set in the
inode's imapping.
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r-- | fs/btrfs/inode.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 793e033cbd17..5a8a749b7e6b 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -382,7 +382,7 @@ static inline int inode_need_compress(struct inode *inode) | |||
382 | * are written in the same order that the flusher thread sent them | 382 | * are written in the same order that the flusher thread sent them |
383 | * down. | 383 | * down. |
384 | */ | 384 | */ |
385 | static noinline int compress_file_range(struct inode *inode, | 385 | static noinline void compress_file_range(struct inode *inode, |
386 | struct page *locked_page, | 386 | struct page *locked_page, |
387 | u64 start, u64 end, | 387 | u64 start, u64 end, |
388 | struct async_cow *async_cow, | 388 | struct async_cow *async_cow, |
@@ -620,8 +620,7 @@ cleanup_and_bail_uncompressed: | |||
620 | *num_added += 1; | 620 | *num_added += 1; |
621 | } | 621 | } |
622 | 622 | ||
623 | out: | 623 | return; |
624 | return ret; | ||
625 | 624 | ||
626 | free_pages_out: | 625 | free_pages_out: |
627 | for (i = 0; i < nr_pages_ret; i++) { | 626 | for (i = 0; i < nr_pages_ret; i++) { |
@@ -629,8 +628,6 @@ free_pages_out: | |||
629 | page_cache_release(pages[i]); | 628 | page_cache_release(pages[i]); |
630 | } | 629 | } |
631 | kfree(pages); | 630 | kfree(pages); |
632 | |||
633 | goto out; | ||
634 | } | 631 | } |
635 | 632 | ||
636 | static void free_async_extent_pages(struct async_extent *async_extent) | 633 | static void free_async_extent_pages(struct async_extent *async_extent) |