From: Wu Fengguang <fengguang.wu@intel.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Jan Kara <jack@suse.cz>, Dave Chinner <david@fromorbit.com>,
Wu Fengguang <fengguang.wu@intel.com>
Cc: LKML <linux-kernel@vger.kernel.org>
Cc: <linux-fsdevel@vger.kernel.org>
Subject: [PATCH 3/6] writeback: make nr_to_write a per-file limit
Date: Wed, 04 May 2011 17:17:10 +0800 [thread overview]
Message-ID: <20110504091909.520602641@intel.com> (raw)
In-Reply-To: 20110504091707.910929441@intel.com
[-- Attachment #1: writeback-single-file-limit.patch --]
[-- Type: text/plain, Size: 2003 bytes --]
This ensures large dirty files can be written in the full 4MB writeback
chunk size, rather than whatever remained quota in wbc->nr_to_write.
CC: Jan Kara <jack@suse.cz>
CC: Dave Chinner <david@fromorbit.com>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
fs/fs-writeback.c | 11 +++++++++++
include/linux/writeback.h | 1 +
2 files changed, 12 insertions(+)
--- linux-next.orig/fs/fs-writeback.c 2011-05-04 16:00:45.000000000 +0800
+++ linux-next/fs/fs-writeback.c 2011-05-04 16:01:00.000000000 +0800
@@ -346,6 +346,8 @@ writeback_single_inode(struct inode *ino
struct writeback_control *wbc)
{
struct address_space *mapping = inode->i_mapping;
+ long per_file_limit = wbc->per_file_limit;
+ long uninitialized_var(nr_to_write);
unsigned dirty;
int ret;
@@ -385,8 +387,16 @@ writeback_single_inode(struct inode *ino
spin_unlock(&inode->i_lock);
spin_unlock(&wb->list_lock);
+ if (per_file_limit) {
+ nr_to_write = wbc->nr_to_write;
+ wbc->nr_to_write = per_file_limit;
+ }
+
ret = do_writepages(mapping, wbc);
+ if (per_file_limit)
+ wbc->nr_to_write += nr_to_write - per_file_limit;
+
/*
* Make sure to wait on the data before writing out the metadata.
* This is important for filesystems that modify metadata on data
@@ -710,6 +720,7 @@ static long wb_writeback(struct bdi_writ
wbc.more_io = 0;
wbc.nr_to_write = write_chunk;
+ wbc.per_file_limit = write_chunk;
wbc.pages_skipped = 0;
wbc.inodes_cleaned = 0;
--- linux-next.orig/include/linux/writeback.h 2011-05-04 16:00:45.000000000 +0800
+++ linux-next/include/linux/writeback.h 2011-05-04 16:01:00.000000000 +0800
@@ -28,6 +28,7 @@ struct writeback_control {
older than this */
long nr_to_write; /* Write this many pages, and decrement
this for each page written */
+ long per_file_limit; /* Write this many pages for one file */
long pages_skipped; /* Pages which were not written */
long inodes_cleaned; /* # of inodes cleaned */
next prev parent reply other threads:[~2011-05-04 9:28 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-04 9:17 [PATCH 0/6] writeback fixes and trace events Wu Fengguang
2011-05-04 9:17 ` [PATCH 1/6] writeback: add bdi_dirty_limit() kernel-doc Wu Fengguang
2011-05-04 9:17 ` [PATCH 2/6] writeback: skip balance_dirty_pages() for in-memory fs Wu Fengguang
2011-05-04 9:17 ` Wu Fengguang [this message]
2011-05-04 9:42 ` [PATCH 3/6] writeback: make nr_to_write a per-file limit Christoph Hellwig
2011-05-04 11:52 ` Wu Fengguang
2011-05-04 15:51 ` Wu Fengguang
2011-05-04 16:18 ` Christoph Hellwig
2011-05-05 10:47 ` Wu Fengguang
2011-05-04 9:17 ` [PATCH 4/6] writeback: trace event writeback_single_inode Wu Fengguang
2011-05-04 9:17 ` [PATCH 5/6] writeback: trace event writeback_queue_io Wu Fengguang
2011-05-05 16:37 ` [PATCH 5/6] writeback: trace event writeback_queue_io (v2) Wu Fengguang
2011-05-05 17:26 ` Jan Kara
2011-05-04 9:17 ` [PATCH 6/6] writeback: convert to relative older_than_this in trace events Wu Fengguang
2011-05-04 22:23 ` Jan Kara
2011-05-05 12:33 ` Wu Fengguang
2011-05-04 9:46 ` [PATCH 0/6] writeback fixes and " Christoph Hellwig
2011-05-04 9:56 ` Wu Fengguang
2011-05-04 10:06 ` Dave Chinner
2011-05-04 11:18 ` Christoph Hellwig
2011-05-04 13:12 ` Theodore Tso
2011-05-04 22:31 ` Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110504091909.520602641@intel.com \
--to=fengguang.wu@intel.com \
--cc=akpm@linux-foundation.org \
--cc=david@fromorbit.com \
--cc=jack@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox