summaryrefslogtreecommitdiff
path: root/fs/block_dev.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-10-23 13:30:47 +0200
committerIngo Molnar <mingo@kernel.org>2017-10-23 13:30:47 +0200
commitf95b23a112f1a31ea042483540cd907b58d23a5f (patch)
tree3d41d2f8cf1d66ed593deb12f25a30d2905eb077 /fs/block_dev.c
parentda20ab35180780e4a6eadc804544f1fa967f3567 (diff)
parent58c3862b521ead4f69a24ef009a679cb3c519620 (diff)
Merge branch 'x86/urgent' into x86/asm, to pick up dependent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/block_dev.c')
-rw-r--r--fs/block_dev.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 93d088ffc05c..789f55e851ae 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -716,10 +716,12 @@ int bdev_write_page(struct block_device *bdev, sector_t sector,
set_page_writeback(page);
result = ops->rw_page(bdev, sector + get_start_sect(bdev), page, true);
- if (result)
+ if (result) {
end_page_writeback(page);
- else
+ } else {
+ clean_page_buffers(page);
unlock_page(page);
+ }
blk_queue_exit(bdev->bd_queue);
return result;
}