aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jbd2/commit.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-09-17 14:52:23 -0400
committerIngo Molnar <mingo@elte.hu>2009-09-17 14:53:10 -0400
commit45bd00d31de886f8425b4dd33204b911b0a466a9 (patch)
tree06204f2452e02ca916666173d50f5035d69065ef /fs/jbd2/commit.c
parent40d9d82c8ab8c4e2373a23a1e31dc8d84c53aa01 (diff)
parentab86e5765d41a5eb4239a1c04d613db87bea5ed8 (diff)
Merge branch 'linus' into tracing/core
Merge reason: Pick up kernel/softirq.c update for dependent fix. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/jbd2/commit.c')
-rw-r--r--fs/jbd2/commit.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 7b4088b2364d..0df600e9162d 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -220,7 +220,6 @@ static int journal_submit_inode_data_buffers(struct address_space *mapping)
220 .nr_to_write = mapping->nrpages * 2, 220 .nr_to_write = mapping->nrpages * 2,
221 .range_start = 0, 221 .range_start = 0,
222 .range_end = i_size_read(mapping->host), 222 .range_end = i_size_read(mapping->host),
223 .for_writepages = 1,
224 }; 223 };
225 224
226 ret = generic_writepages(mapping, &wbc); 225 ret = generic_writepages(mapping, &wbc);