xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'core/locking' into core/urgent

Browse Source
This commit is contained in:
Ingo Molnar
2008-08-12 00:11:49 +02:00
parent cc7a486cac 0f2bc27be2
commit 23a0ee908c
15 changed files with 366 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/jbd/transaction.c
View File

@@ -291,7 +291,7 @@ handle_t *journal_start(journal_t *journal, int nblocks)
goto out;
}
lock_acquire(&handle->h_lockdep_map, 0, 0, 0, 2, _THIS_IP_);
lock_map_acquire(&handle->h_lockdep_map);
out:
return handle;
@@ -1448,7 +1448,7 @@ int journal_stop(handle_t *handle)
spin_unlock(&journal->j_state_lock);
}
lock_release(&handle->h_lockdep_map, 1, _THIS_IP_);
lock_map_release(&handle->h_lockdep_map);
jbd_free_handle(handle);
return err;