From b038238076c4b775f7b194aa1cd0ea91ab076432 Mon Sep 17 00:00:00 2001 From: Yan Hong Date: Mon, 8 Oct 2012 16:33:45 -0700 Subject: [PATCH] --- yaml --- r: 332467 b: refs/heads/master c: cd8ed2a45a401cb692d769e92de7d73aa42fabce h: refs/heads/master i: 332465: 4d80128514c869777a33d7d2b8a882680d76a29b 332463: f021cc1e94c74ae8b0d02b319640b106b9b911f9 v: v3 --- [refs] | 2 +- trunk/fs/fs-writeback.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 685ef5394008..c8c820b019f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c462f179e4d273f0da0e7cf302e29b0edf43844e +refs/heads/master: cd8ed2a45a401cb692d769e92de7d73aa42fabce diff --git a/trunk/fs/fs-writeback.c b/trunk/fs/fs-writeback.c index 8e1d7b9e4a33..401b6c6248ae 100644 --- a/trunk/fs/fs-writeback.c +++ b/trunk/fs/fs-writeback.c @@ -439,8 +439,7 @@ static void requeue_inode(struct inode *inode, struct bdi_writeback *wb, * setting I_SYNC flag and calling inode_sync_complete() to clear it. */ static int -__writeback_single_inode(struct inode *inode, struct bdi_writeback *wb, - struct writeback_control *wbc) +__writeback_single_inode(struct inode *inode, struct writeback_control *wbc) { struct address_space *mapping = inode->i_mapping; long nr_to_write = wbc->nr_to_write; @@ -527,7 +526,7 @@ writeback_single_inode(struct inode *inode, struct bdi_writeback *wb, inode->i_state |= I_SYNC; spin_unlock(&inode->i_lock); - ret = __writeback_single_inode(inode, wb, wbc); + ret = __writeback_single_inode(inode, wbc); spin_lock(&wb->list_lock); spin_lock(&inode->i_lock); @@ -670,7 +669,7 @@ static long writeback_sb_inodes(struct super_block *sb, * We use I_SYNC to pin the inode in memory. While it is set * evict_inode() will wait so the inode cannot be freed. */ - __writeback_single_inode(inode, wb, &wbc); + __writeback_single_inode(inode, &wbc); work->nr_pages -= write_chunk - wbc.nr_to_write; wrote += write_chunk - wbc.nr_to_write;