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

Commit 58409edd authored by David Sterba's avatar David Sterba
Browse files

btrfs: kill unused writepage_io_hook callback 



It seems to be long time unused, since 2008 and
6885f308 ("Btrfs: Misc 2.6.25 updates").

Propagating the removal touches some code but has no functional effect.

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

fs/btrfs/extent_io.c

+16 −23
Original line number Diff line number Diff line
@@ -3368,6 +3368,8 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode, 


	while (cur <= end) {

		u64 em_end;

		unsigned long max_nr;



		if (cur >= i_size) {

			if (tree->ops && tree->ops->writepage_end_io_hook)

				tree->ops->writepage_end_io_hook(page, cur,
@@ -3423,16 +3425,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode, 
			continue;

		}



		if (tree->ops && tree->ops->writepage_io_hook) {

			ret = tree->ops->writepage_io_hook(page, cur,

						cur + iosize - 1);

		} else {

			ret = 0;

		}

		if (ret) {

			SetPageError(page);

		} else {

			unsigned long max_nr = (i_size >> PAGE_SHIFT) + 1;

		max_nr = (i_size >> PAGE_SHIFT) + 1;



		set_range_writeback(tree, cur, cur + iosize - 1);

		if (!PageWriteback(page)) {
@@ -3448,7 +3441,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode, 
					 0, 0, 0, false);

		if (ret)

			SetPageError(page);

		}



		cur = cur + iosize;

		pg_offset += iosize;

		nr++;

fs/btrfs/extent_io.h

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ struct extent_io_ops { 
			     u64 start, u64 end, int *page_started,

			     unsigned long *nr_written);

	int (*writepage_start_hook)(struct page *page, u64 start, u64 end);

	int (*writepage_io_hook)(struct page *page, u64 start, u64 end);

	extent_submit_bio_hook_t *submit_bio_hook;

	int (*merge_bio_hook)(int rw, struct page *page, unsigned long offset,

			      size_t size, struct bio *bio,