Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5227c07 authored by David Sterba's avatar David Sterba
Browse files

btrfs: make end_extent_writepage return void 



Does not return any errors, nor anything from the callgraph.  The branch
in end_bio_extent_writepage has been skipped since
5fd02043 ("Btrfs: finish ordered extents in their own thread").

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent a9d93e17

fs/btrfs/extent_io.c

+2 −5
Original line number Diff line number Diff line
@@ -2515,7 +2515,7 @@ static int bio_readpage_error(struct bio *failed_bio, u64 phy_offset, 


/* lots and lots of room for performance fixes in the end_bio funcs */



int end_extent_writepage(struct page *page, int err, u64 start, u64 end)

void end_extent_writepage(struct page *page, int err, u64 start, u64 end)

{

	int uptodate = (err == 0);

	struct extent_io_tree *tree;
@@ -2536,7 +2536,6 @@ int end_extent_writepage(struct page *page, int err, u64 start, u64 end) 
		ret = ret < 0 ? ret : -EIO;

		mapping_set_error(page->mapping, ret);

	}

	return 0;

}



/*
@@ -2578,9 +2577,7 @@ static void end_bio_extent_writepage(struct bio *bio) 
		start = page_offset(page);

		end = start + bvec->bv_offset + bvec->bv_len - 1;



		if (end_extent_writepage(page, bio->bi_error, start, end))

			continue;



		end_extent_writepage(page, bio->bi_error, start, end);

		end_page_writeback(page);

	}

fs/btrfs/extent_io.h

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ int repair_io_failure(struct inode *inode, u64 start, u64 length, u64 logical, 
		      int mirror_num);

int clean_io_failure(struct inode *inode, u64 start, struct page *page,

		     unsigned int pg_offset);

int end_extent_writepage(struct page *page, int err, u64 start, u64 end);

void end_extent_writepage(struct page *page, int err, u64 start, u64 end);

int repair_eb_io_failure(struct btrfs_root *root, struct extent_buffer *eb,

			 int mirror_num);