|
@@ -2694,15 +2694,6 @@ out:
|
|
return err;
|
|
return err;
|
|
}
|
|
}
|
|
|
|
|
|
-static int __writepage(struct page *page, struct writeback_control *wbc,
|
|
|
|
- void *data)
|
|
|
|
-{
|
|
|
|
- struct address_space *mapping = data;
|
|
|
|
- int ret = ext4_writepage(page, wbc);
|
|
|
|
- mapping_set_error(mapping, ret);
|
|
|
|
- return ret;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
static int ext4_writepages(struct address_space *mapping,
|
|
static int ext4_writepages(struct address_space *mapping,
|
|
struct writeback_control *wbc)
|
|
struct writeback_control *wbc)
|
|
{
|
|
{
|
|
@@ -2740,11 +2731,7 @@ static int ext4_writepages(struct address_space *mapping,
|
|
goto out_writepages;
|
|
goto out_writepages;
|
|
|
|
|
|
if (ext4_should_journal_data(inode)) {
|
|
if (ext4_should_journal_data(inode)) {
|
|
- struct blk_plug plug;
|
|
|
|
-
|
|
|
|
- blk_start_plug(&plug);
|
|
|
|
- ret = write_cache_pages(mapping, wbc, __writepage, mapping);
|
|
|
|
- blk_finish_plug(&plug);
|
|
|
|
|
|
+ ret = generic_writepages(mapping, wbc);
|
|
goto out_writepages;
|
|
goto out_writepages;
|
|
}
|
|
}
|
|
|
|
|