From 6a76d7c327bc308378f78eb92bf8fa5851a711c4 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 5 Jun 2007 11:05:11 +0200 Subject: [PATCH] --- yaml --- r: 57515 b: refs/heads/master c: 20d698db67059a63d217030dfd02872cb5f88dfb h: refs/heads/master i: 57513: 34d5abe9e8f4367c7589e6c820754615af6a26ff 57511: 29c49ada7b29f676b1cb36a7198740d67944774d v: v3 --- [refs] | 2 +- trunk/fs/splice.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 66b67d87e2cd..714c4627bb3d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17374ff1aa9ce2a0597416a16729474b538af443 +refs/heads/master: 20d698db67059a63d217030dfd02872cb5f88dfb diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c index b78a7f057be1..6349d3189e3f 100644 --- a/trunk/fs/splice.c +++ b/trunk/fs/splice.c @@ -652,7 +652,6 @@ static int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf, * accessed, we are now done! */ mark_page_accessed(page); - balance_dirty_pages_ratelimited(mapping); out: page_cache_release(page); unlock_page(page); @@ -823,6 +822,7 @@ generic_file_splice_write_nolock(struct pipe_inode_info *pipe, struct file *out, if (err) ret = err; } + balance_dirty_pages_ratelimited(mapping); } return ret; @@ -876,6 +876,7 @@ generic_file_splice_write(struct pipe_inode_info *pipe, struct file *out, if (err) ret = err; } + balance_dirty_pages_ratelimited(mapping); } return ret;