mirror of
https://gitee.com/bianbu-linux/linux-6.6
synced 2025-04-24 14:07:52 -04:00
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>
This commit is contained in:
parent
f2d3e573bf
commit
cf5e7a6521
1 changed files with 6 additions and 16 deletions
16
fs/mpage.c
16
fs/mpage.c
|
@ -638,8 +638,6 @@ out:
|
||||||
* @mapping: address space structure to write
|
* @mapping: address space structure to write
|
||||||
* @wbc: subtract the number of written pages from *@wbc->nr_to_write
|
* @wbc: subtract the number of written pages from *@wbc->nr_to_write
|
||||||
* @get_block: the filesystem's block mapper function.
|
* @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()
|
* This is a library function, which implements the writepages()
|
||||||
* address_space_operation.
|
* address_space_operation.
|
||||||
|
@ -656,24 +654,16 @@ int
|
||||||
mpage_writepages(struct address_space *mapping,
|
mpage_writepages(struct address_space *mapping,
|
||||||
struct writeback_control *wbc, get_block_t get_block)
|
struct writeback_control *wbc, get_block_t get_block)
|
||||||
{
|
{
|
||||||
|
struct mpage_data mpd = {
|
||||||
|
.get_block = get_block,
|
||||||
|
};
|
||||||
struct blk_plug plug;
|
struct blk_plug plug;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
blk_start_plug(&plug);
|
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);
|
ret = write_cache_pages(mapping, wbc, __mpage_writepage, &mpd);
|
||||||
if (mpd.bio)
|
if (mpd.bio)
|
||||||
mpage_bio_submit(mpd.bio);
|
mpage_bio_submit(mpd.bio);
|
||||||
}
|
|
||||||
blk_finish_plug(&plug);
|
blk_finish_plug(&plug);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue