btrfs: remove trivial goto label in __extent_writepage() (169d2c87) · Commits · 戴 / test

Since ("Btrfs: split up __extent_writepage to lower stack usage"), done_unlocked is simply a return 0. Get rid of it. Mid-statement block returns don seem to make the code less readable here. 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>

fs/btrfs/extent_io.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -3596,7 +3596,7 @@ static int __extent_writepage(struct page page, struct writeback_control wbc,
		if (!epd->extent_locked) {
		ret = writepage_delalloc(inode, page, wbc, start, &nr_written);
		if (ret == 1)
		goto done_unlocked;
		return 0;
		if (ret)
		goto done;
		}
		@@ -3604,7 +3604,7 @@ static int __extent_writepage(struct page page, struct writeback_control wbc,
		ret = __extent_writepage_io(inode, page, wbc, epd,
		i_size, nr_written, &nr);
		if (ret == 1)
		goto done_unlocked;
		return 0;

		done:
		if (nr == 0) {
		@@ -3619,9 +3619,6 @@ done:
		unlock_page(page);
		ASSERT(ret <= 0);
		return ret;

		done_unlocked:
		return 0;
		}

		void wait_on_extent_buffer_writeback(struct extent_buffer *eb)

Admin message