From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail172.messagelabs.com (mail172.messagelabs.com [216.82.254.3]) by kanga.kvack.org (Postfix) with SMTP id E40B98D0048 for ; Thu, 3 Mar 2011 03:17:57 -0500 (EST) Message-Id: <20110303074951.964058636@intel.com> Date: Thu, 03 Mar 2011 14:45:30 +0800 From: Wu Fengguang Subject: [PATCH 25/27] writeback: make nr_to_write a per-file limit References: <20110303064505.718671603@intel.com> Content-Disposition: inline; filename=writeback-single-file-limit.patch Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton Cc: Jan Kara , Wu Fengguang , Christoph Hellwig , Trond Myklebust , Dave Chinner , Theodore Ts'o , Chris Mason , Peter Zijlstra , Mel Gorman , Rik van Riel , KOSAKI Motohiro , Greg Thelen , Minchan Kim , Vivek Goyal , Andrea Righi , Balbir Singh , linux-mm , linux-fsdevel@vger.kernel.org, LKML This ensures full 4MB or larger writeback size for large dirty files. CC: Jan Kara Signed-off-by: Wu Fengguang --- fs/fs-writeback.c | 11 +++++++++++ include/linux/writeback.h | 1 + 2 files changed, 12 insertions(+) --- linux-next.orig/fs/fs-writeback.c 2011-03-03 14:02:53.000000000 +0800 +++ linux-next/fs/fs-writeback.c 2011-03-03 14:03:32.000000000 +0800 @@ -330,6 +330,8 @@ static int writeback_single_inode(struct inode *inode, 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; @@ -365,8 +367,16 @@ writeback_single_inode(struct inode *ino inode->i_state &= ~I_DIRTY_PAGES; spin_unlock(&inode_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 @@ -689,6 +699,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; trace_wbc_writeback_start(&wbc, wb->bdi); --- linux-next.orig/include/linux/writeback.h 2011-03-03 14:02:53.000000000 +0800 +++ linux-next/include/linux/writeback.h 2011-03-03 14:03:32.000000000 +0800 @@ -74,6 +74,7 @@ struct writeback_control { extra jobs and livelock */ 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 */ /* -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org