diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /fs/jbd/checkpoint.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'fs/jbd/checkpoint.c')
| -rw-r--r-- | fs/jbd/checkpoint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c index 543ed543d1e5..3f5102b069db 100644 --- a/fs/jbd/checkpoint.c +++ b/fs/jbd/checkpoint.c | |||
| @@ -85,7 +85,7 @@ void __log_wait_for_space(journal_t *journal) | |||
| 85 | if (journal->j_flags & JFS_ABORT) | 85 | if (journal->j_flags & JFS_ABORT) |
| 86 | return; | 86 | return; |
| 87 | spin_unlock(&journal->j_state_lock); | 87 | spin_unlock(&journal->j_state_lock); |
| 88 | down(&journal->j_checkpoint_sem); | 88 | mutex_lock(&journal->j_checkpoint_mutex); |
| 89 | 89 | ||
| 90 | /* | 90 | /* |
| 91 | * Test again, another process may have checkpointed while we | 91 | * Test again, another process may have checkpointed while we |
| @@ -98,7 +98,7 @@ void __log_wait_for_space(journal_t *journal) | |||
| 98 | log_do_checkpoint(journal); | 98 | log_do_checkpoint(journal); |
| 99 | spin_lock(&journal->j_state_lock); | 99 | spin_lock(&journal->j_state_lock); |
| 100 | } | 100 | } |
| 101 | up(&journal->j_checkpoint_sem); | 101 | mutex_unlock(&journal->j_checkpoint_mutex); |
| 102 | } | 102 | } |
| 103 | } | 103 | } |
| 104 | 104 | ||