From 8fe3ac77271633bf546c5b3c9e6b6899cc02d608 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Mon, 6 Oct 2008 12:04:02 -0400 Subject: [PATCH] --- yaml --- r: 112963 b: refs/heads/master c: 45a90bfd90c1215bf824c0f705b409723f52361b h: refs/heads/master i: 112961: c8055660fc84324670ca6e9be4c713481c51d626 112959: 77f0a3c0156da470e2c8285c4ea4604cd6736aa9 v: v3 --- [refs] | 2 +- trunk/fs/jbd2/commit.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 46e094f608e0..0969f5c9f0db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ede86cc473defab74d778aeac14b19f43129d4d1 +refs/heads/master: 45a90bfd90c1215bf824c0f705b409723f52361b diff --git a/trunk/fs/jbd2/commit.c b/trunk/fs/jbd2/commit.c index e91f051a9859..0d3814a35ed1 100644 --- a/trunk/fs/jbd2/commit.c +++ b/trunk/fs/jbd2/commit.c @@ -127,8 +127,7 @@ static int journal_submit_commit_record(journal_t *journal, JBUFFER_TRACE(descriptor, "submit commit block"); lock_buffer(bh); - get_bh(bh); - set_buffer_dirty(bh); + clear_buffer_dirty(bh); set_buffer_uptodate(bh); bh->b_end_io = journal_end_buffer_io_sync; @@ -158,7 +157,7 @@ static int journal_submit_commit_record(journal_t *journal, /* And try again, without the barrier */ lock_buffer(bh); set_buffer_uptodate(bh); - set_buffer_dirty(bh); + clear_buffer_dirty(bh); ret = submit_bh(WRITE, bh); } *cbh = bh;