diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-12 00:11:49 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-12 00:11:49 +0200 |
| commit | 23a0ee908cbfba3264d19729c67c22b20fa73886 (patch) | |
| tree | 541103f6283cbac6b82cff88a7b91128acfce046 /fs | |
| parent | cc7a486cac78f6fc1a24e8cd63036bae8d2ab431 (diff) | |
| parent | 0f2bc27be27ca1dcc66b96131e44bf7648b959c6 (diff) | |
| download | linux-23a0ee908cbfba3264d19729c67c22b20fa73886.tar.bz2 | |
Merge branch 'core/locking' into core/urgent
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jbd/transaction.c | 4 | ||||
| -rw-r--r-- | fs/jbd2/transaction.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index 8dee32007500..0540ca27a446 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c @@ -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; diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index 4f7cadbb19fa..e5d540588fa9 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -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; |