From: Christoph Hellwig <hch@lst.de>
Date: Mon, 13 Jun 2022 05:37:15 +0000 (+0200)
Subject: fs: remove the NULL get_block case in mpage_writepages
X-Git-Tag: baikal/mips/sdk6.1~5169^2
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=9fa871429e560a4d1a2df21d6d76ebe8e352a826;p=kernel.git

fs: remove the NULL get_block case in mpage_writepages

No one calls mpage_writepages with a NULL get_block paramter, so remove
support for that case.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---

diff --git a/fs/mpage.c b/fs/mpage.c
index bf7d1cf621e2f..8326ff8a7a96e 100644
--- a/fs/mpage.c
+++ b/fs/mpage.c
@@ -638,8 +638,6 @@ out:
  * @mapping: address space structure to write
  * @wbc: subtract the number of written pages from *@wbc->nr_to_write
  * @get_block: the filesystem's block mapper function.
- *             If this is NULL then use a_ops->writepage.  Otherwise, go
- *             direct-to-BIO.
  *
  * This is a library function, which implements the writepages()
  * address_space_operation.
@@ -656,24 +654,16 @@ int
 mpage_writepages(struct address_space *mapping,
 		struct writeback_control *wbc, get_block_t get_block)
 {
+	struct mpage_data mpd = {
+		.get_block	= get_block,
+	};
 	struct blk_plug plug;
 	int ret;
 
 	blk_start_plug(&plug);
-
-	if (!get_block)
-		ret = generic_writepages(mapping, wbc);
-	else {
-		struct mpage_data mpd = {
-			.bio = NULL,
-			.last_block_in_bio = 0,
-			.get_block = get_block,
-		};
-
-		ret = write_cache_pages(mapping, wbc, __mpage_writepage, &mpd);
-		if (mpd.bio)
-			mpage_bio_submit(mpd.bio);
-	}
+	ret = write_cache_pages(mapping, wbc, __mpage_writepage, &mpd);
+	if (mpd.bio)
+		mpage_bio_submit(mpd.bio);
 	blk_finish_plug(&plug);
 	return ret;
 }