summaryrefslogtreecommitdiffstats
path: root/fs/jbd2
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2008-06-04 04:31:11 +0200
committerTheodore Ts'o <tytso@mit.edu>2008-06-04 04:31:11 +0200
commit034772b068be62a79470d6c1b81b01fbe27793ac (patch)
tree408b55ae9241d1dca1145e16ff781b5f0112dd35 /fs/jbd2
parentext4: Display the journal_async_commit mount option in /proc/mounts (diff)
downloadlinux-034772b068be62a79470d6c1b81b01fbe27793ac.tar.xz
linux-034772b068be62a79470d6c1b81b01fbe27793ac.zip
jbd2: Fix barrier fallback code to re-lock the buffer head
If the device doesn't support write barriers, the write is retried without ordered mode. But the buffer head needs to be re-locked or submit_bh will fail with on BUG(!buffer_locked(bh)). Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/jbd2')
-rw-r--r--fs/jbd2/commit.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 4d99685fdce4..a2ed72f7ceee 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -168,6 +168,7 @@ static int journal_submit_commit_record(journal_t *journal,
spin_unlock(&journal->j_state_lock);
/* And try again, without the barrier */
+ lock_buffer(bh);
set_buffer_uptodate(bh);
set_buffer_dirty(bh);
ret = submit_bh(WRITE, bh);