mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge branch 'core/locking' into core/urgent
This commit is contained in:
commit
23a0ee908c
15 changed files with 366 additions and 146 deletions
|
|
@ -301,7 +301,7 @@ handle_t *jbd2_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;
|
||||
}
|
||||
|
|
@ -1279,7 +1279,7 @@ int jbd2_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);
|
||||
|
||||
jbd2_free_handle(handle);
|
||||
return err;
|
||||
|
|
|
|||
Loading…
Reference in a new issue