public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: assume that bio_ret is always valid in submit_extent_page

Browse source 
All callers pass a valid pointer so we can drop the redundant checks.
The call to submit_one_bio never happend and can be removed.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2017-06-06 19:22:55 +02:00
parent 6ca1765b36
commit 5c2b1fd753
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/btrfs/extent_io.c
View file

@ -2758,6 +2758,7 @@ static int merge_bio(struct extent_io_tree *tree, struct page *page,
/* /*
* @opf: bio REQ_OP_* and REQ_* flags as one value * @opf: bio REQ_OP_* and REQ_* flags as one value
* @bio_ret: must be valid pointer, newly allocated bio will be stored there
*/ */
static int submit_extent_page(unsigned int opf, struct extent_io_tree *tree, static int submit_extent_page(unsigned int opf, struct extent_io_tree *tree,
struct writeback_control *wbc, struct writeback_control *wbc,
@ -2778,7 +2779,9 @@ static int submit_extent_page(unsigned int opf, struct extent_io_tree *tree,
size_t page_size = min_t(size_t, size, PAGE_SIZE); size_t page_size = min_t(size_t, size, PAGE_SIZE);
sector_t sector = offset >> 9; sector_t sector = offset >> 9;
if (bio_ret && *bio_ret) { ASSERT(bio_ret);
if (*bio_ret) {
bio = *bio_ret; bio = *bio_ret;
if (old_compressed) if (old_compressed)
contig = bio->bi_iter.bi_sector == sector; contig = bio->bi_iter.bi_sector == sector;
@ -2813,10 +2816,7 @@ static int submit_extent_page(unsigned int opf, struct extent_io_tree *tree,
wbc_account_io(wbc, page, page_size); wbc_account_io(wbc, page, page_size);
} }
if (bio_ret) *bio_ret = bio;
*bio_ret = bio;
else
ret = submit_one_bio(bio, mirror_num, bio_flags);
return ret; return ret;
} }