diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 13:54:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 13:54:22 -0700 |
| commit | 30d73f375238441d6dc31de0d90bc39f5bb0bfe5 (patch) | |
| tree | 0a94e144fbb7d3fa84c443fb6cc61f2f01f61a1b /fs/dlm/lock.h | |
| parent | e2a0883e4071237d09b604a342c28b96b44a04b3 (diff) | |
| parent | 1b189b8889b7d8e0bddc2655d171c43cfd344157 (diff) | |
| download | linux-30d73f375238441d6dc31de0d90bc39f5bb0bfe5.tar.gz linux-30d73f375238441d6dc31de0d90bc39f5bb0bfe5.tar.bz2 linux-30d73f375238441d6dc31de0d90bc39f5bb0bfe5.zip | |
Merge tag 'dlm-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
Pull dlm updates for 3.4 from David Teigland:
"This set includes one trivial fix, and one simple recovery speed up.
Directory recovery can use the standard hash table to find resources
rather than always searching the linear recovery list."
* tag 'dlm-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
dlm: last element of dlm_local_addr[] never used
dlm: fix slow rsb search in dir recovery
Diffstat (limited to 'fs/dlm/lock.h')
| -rw-r--r-- | fs/dlm/lock.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/dlm/lock.h b/fs/dlm/lock.h index 265017a7c3e7..1a255307f6ff 100644 --- a/fs/dlm/lock.h +++ b/fs/dlm/lock.h @@ -28,6 +28,9 @@ void dlm_scan_waiters(struct dlm_ls *ls); void dlm_scan_timeout(struct dlm_ls *ls); void dlm_adjust_timeouts(struct dlm_ls *ls); +int dlm_search_rsb_tree(struct rb_root *tree, char *name, int len, + unsigned int flags, struct dlm_rsb **r_ret); + int dlm_purge_locks(struct dlm_ls *ls); void dlm_purge_mstcpy_locks(struct dlm_rsb *r); void dlm_grant_after_purge(struct dlm_ls *ls); |