diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /fs/jbd/checkpoint.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
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 05a38b9c4c0e..e4b87bc1fa56 100644 --- a/fs/jbd/checkpoint.c +++ b/fs/jbd/checkpoint.c | |||
| @@ -221,7 +221,7 @@ restart: | |||
| 221 | goto restart; | 221 | goto restart; |
| 222 | } | 222 | } |
| 223 | if (buffer_locked(bh)) { | 223 | if (buffer_locked(bh)) { |
| 224 | atomic_inc(&bh->b_count); | 224 | get_bh(bh); |
| 225 | spin_unlock(&journal->j_list_lock); | 225 | spin_unlock(&journal->j_list_lock); |
| 226 | jbd_unlock_bh_state(bh); | 226 | jbd_unlock_bh_state(bh); |
| 227 | wait_on_buffer(bh); | 227 | wait_on_buffer(bh); |
| @@ -283,7 +283,7 @@ static int __process_buffer(journal_t *journal, struct journal_head *jh, | |||
| 283 | int ret = 0; | 283 | int ret = 0; |
| 284 | 284 | ||
| 285 | if (buffer_locked(bh)) { | 285 | if (buffer_locked(bh)) { |
| 286 | atomic_inc(&bh->b_count); | 286 | get_bh(bh); |
| 287 | spin_unlock(&journal->j_list_lock); | 287 | spin_unlock(&journal->j_list_lock); |
| 288 | jbd_unlock_bh_state(bh); | 288 | jbd_unlock_bh_state(bh); |
| 289 | wait_on_buffer(bh); | 289 | wait_on_buffer(bh); |