aboutsummaryrefslogtreecommitdiffstats
path: root/fs/fuse/file.c
diff options
context:
space:
mode:
authorMaxim Patlasov <MPatlasov@parallels.com>2013-10-02 13:38:43 -0400
committerMiklos Szeredi <mszeredi@suse.cz>2013-11-05 04:11:28 -0500
commit41b6e41fc609753a9386d24295f7ed03b28c4601 (patch)
tree923f7cdb4cc82f5506b2ebaf05c90013e35902d2 /fs/fuse/file.c
parent6eaf4782eb09e28dbd13d23b9ce0fb7646daf37e (diff)
fuse: writepages: update bdi writeout when deleting secondary request
BDI_WRITTEN counter is used to estimate bdi bandwidth. It must be incremented every time as bdi ends page writeback. No matter whether it was fulfilled by actual write or by discarding the request (e.g. due to shrunk i_size). Note that even before writepages patches, the case "Got truncated off completely" was handled in fuse_send_writepage() by calling fuse_writepage_finish() which updated BDI_WRITTEN unconditionally. Signed-off-by: Maxim Patlasov <MPatlasov@parallels.com> Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Diffstat (limited to 'fs/fuse/file.c')
-rw-r--r--fs/fuse/file.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 1cb303eba4d0..e6fdd59a7906 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1701,11 +1701,14 @@ static bool fuse_writepage_in_flight(struct fuse_req *new_req,
1701 1701
1702 if (old_req->num_pages == 1 && (old_req->state == FUSE_REQ_INIT || 1702 if (old_req->num_pages == 1 && (old_req->state == FUSE_REQ_INIT ||
1703 old_req->state == FUSE_REQ_PENDING)) { 1703 old_req->state == FUSE_REQ_PENDING)) {
1704 struct backing_dev_info *bdi = page->mapping->backing_dev_info;
1705
1704 copy_highpage(old_req->pages[0], page); 1706 copy_highpage(old_req->pages[0], page);
1705 spin_unlock(&fc->lock); 1707 spin_unlock(&fc->lock);
1706 1708
1707 dec_bdi_stat(page->mapping->backing_dev_info, BDI_WRITEBACK); 1709 dec_bdi_stat(bdi, BDI_WRITEBACK);
1708 dec_zone_page_state(page, NR_WRITEBACK_TEMP); 1710 dec_zone_page_state(page, NR_WRITEBACK_TEMP);
1711 bdi_writeout_inc(bdi);
1709 fuse_writepage_free(fc, new_req); 1712 fuse_writepage_free(fc, new_req);
1710 fuse_request_free(new_req); 1713 fuse_request_free(new_req);
1711 goto out; 1714 goto out;