On Wed 08-06-22 17:04:51, Christoph Hellwig wrote:
> No one calls mpage_writepages with a NULL get_block paramter, so remove
> support for that case.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
What about ntfs_writepages()? That seems to call mpage_writepages() with
NULL get_block() in one case...
Honza
> ---
> fs/mpage.c | 22 ++++++----------------
> 1 file changed, 6 insertions(+), 16 deletions(-)
>
> diff --git a/fs/mpage.c b/fs/mpage.c
> index a354ef2b4b4eb..e4cf881634a6a 100644
> --- a/fs/mpage.c
> +++ b/fs/mpage.c
> @@ -636,8 +636,6 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc,
> * @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.
> @@ -654,24 +652,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;
> }
> --
> 2.30.2
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
