diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-10-23 12:15:08 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-10-23 12:15:08 -0400 |
| commit | ab44280a7951ea04105c17152286582985028fcc (patch) | |
| tree | 2266f4377120313147090c313d9f4948001e8c75 /fs/fuse/file.c | |
| parent | 596dcbfbdfdce79dc2cbef88f678e8ae74ab7a01 (diff) | |
| parent | 940d5466e08c41c44366d5ea4b36930d1dbd02c3 (diff) | |
Merge tag 'v3.4.63' into v3.4-rt
This is the 3.4.63 stable release
Diffstat (limited to 'fs/fuse/file.c')
| -rw-r--r-- | fs/fuse/file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 8e6381a14265..df25454eadf1 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1294,7 +1294,6 @@ static int fuse_writepage_locked(struct page *page) inc_bdi_stat(mapping->backing_dev_info, BDI_WRITEBACK); inc_zone_page_state(tmp_page, NR_WRITEBACK_TEMP); - end_page_writeback(page); spin_lock(&fc->lock); list_add(&req->writepages_entry, &fi->writepages); @@ -1302,6 +1301,8 @@ static int fuse_writepage_locked(struct page *page) fuse_flush_writepages(inode); spin_unlock(&fc->lock); + end_page_writeback(page); + return 0; err_free: |