diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:24:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:24:43 -0400 |
| commit | 8bbd54d69e9c66adbf544e21d8dcfb15fb9198f7 (patch) | |
| tree | 95f30814fc759c2cb523dbea95bc531c7f8f3231 /fs/jbd2/commit.c | |
| parent | 8c2238eaaf0f774ca0f8d9daad7a616429bbb7f1 (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'fs/jbd2/commit.c')
| -rw-r--r-- | fs/jbd2/commit.c | 1 |
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, | |||
| 168 | spin_unlock(&journal->j_state_lock); | 168 | spin_unlock(&journal->j_state_lock); |
| 169 | 169 | ||
| 170 | /* And try again, without the barrier */ | 170 | /* And try again, without the barrier */ |
| 171 | lock_buffer(bh); | ||
| 171 | set_buffer_uptodate(bh); | 172 | set_buffer_uptodate(bh); |
| 172 | set_buffer_dirty(bh); | 173 | set_buffer_dirty(bh); |
| 173 | ret = submit_bh(WRITE, bh); | 174 | ret = submit_bh(WRITE, bh); |