From 97027e30008c54546578a3ca4daa1af1d95b9fee Mon Sep 17 00:00:00 2001
From: Wu Fengguang <fengguang.wu@intel.com>
Date: Tue, 24 Nov 2009 11:15:44 -0500
Subject: [PATCH] --- yaml --- r: 174393 b: refs/heads/master c:
 3f0ca309858ee186435c608ee9eaafd1c8dcb53a h: refs/heads/master i:   174391:
 923a62c1528763dd9bf5947558a3c20479c24b06 v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext4/inode.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b62c248a5652..e71f6c49ed3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4d7241596ffb6398ac5535ae8cf80d845b0c254
+refs/heads/master: 3f0ca309858ee186435c608ee9eaafd1c8dcb53a
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index 3b28e1fbfc90..d3f99e9e8a31 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -2558,7 +2558,6 @@ static int bput_one(handle_t *handle, struct buffer_head *bh)
 }
 
 static int __ext4_journalled_writepage(struct page *page,
-				       struct writeback_control *wbc,
 				       unsigned int len)
 {
 	struct address_space *mapping = page->mapping;
@@ -2716,7 +2715,7 @@ static int ext4_writepage(struct page *page,
 		 * doesn't seem much point in redirtying the page here.
 		 */
 		ClearPageChecked(page);
-		return __ext4_journalled_writepage(page, wbc, len);
+		return __ext4_journalled_writepage(page, len);
 	}
 
 	if (test_opt(inode->i_sb, NOBH) && ext4_should_writeback_data(inode))