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/dir.c | |
| parent | e2a0883e4071237d09b604a342c28b96b44a04b3 (diff) | |
| parent | 1b189b8889b7d8e0bddc2655d171c43cfd344157 (diff) | |
| download | linux-3.10-30d73f375238441d6dc31de0d90bc39f5bb0bfe5.tar.gz linux-3.10-30d73f375238441d6dc31de0d90bc39f5bb0bfe5.tar.bz2 linux-3.10-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/dir.c')
| -rw-r--r-- | fs/dlm/dir.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/fs/dlm/dir.c b/fs/dlm/dir.c index 83641574b01..dc5eb598b81 100644 --- a/fs/dlm/dir.c +++ b/fs/dlm/dir.c @@ -351,11 +351,28 @@ int dlm_dir_lookup(struct dlm_ls *ls, int nodeid, char *name, int namelen, static struct dlm_rsb *find_rsb_root(struct dlm_ls *ls, char *name, int len) { struct dlm_rsb *r; + uint32_t hash, bucket; + int rv; + + hash = jhash(name, len, 0); + bucket = hash & (ls->ls_rsbtbl_size - 1); + + spin_lock(&ls->ls_rsbtbl[bucket].lock); + rv = dlm_search_rsb_tree(&ls->ls_rsbtbl[bucket].keep, name, len, 0, &r); + if (rv) + rv = dlm_search_rsb_tree(&ls->ls_rsbtbl[bucket].toss, + name, len, 0, &r); + spin_unlock(&ls->ls_rsbtbl[bucket].lock); + + if (!rv) + return r; down_read(&ls->ls_root_sem); list_for_each_entry(r, &ls->ls_root_list, res_root_list) { if (len == r->res_length && !memcmp(name, r->res_name, len)) { up_read(&ls->ls_root_sem); + log_error(ls, "find_rsb_root revert to root_list %s", + r->res_name); return r; } } |