Commit 850cb82b authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'dlm-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

Pull dlm update from David Teigland:
 "This includes a single patch to avoid excessive and unnecessary
  scanning of rsbs to free."

* tag 'dlm-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: avoid scanning unchanged toss lists
parents 2171ee8f f1172283
...@@ -96,10 +96,13 @@ do { \ ...@@ -96,10 +96,13 @@ do { \
} }
#define DLM_RTF_SHRINK 0x00000001
struct dlm_rsbtable { struct dlm_rsbtable {
struct rb_root keep; struct rb_root keep;
struct rb_root toss; struct rb_root toss;
spinlock_t lock; spinlock_t lock;
uint32_t flags;
}; };
......
...@@ -1132,6 +1132,7 @@ static void toss_rsb(struct kref *kref) ...@@ -1132,6 +1132,7 @@ static void toss_rsb(struct kref *kref)
rb_erase(&r->res_hashnode, &ls->ls_rsbtbl[r->res_bucket].keep); rb_erase(&r->res_hashnode, &ls->ls_rsbtbl[r->res_bucket].keep);
rsb_insert(r, &ls->ls_rsbtbl[r->res_bucket].toss); rsb_insert(r, &ls->ls_rsbtbl[r->res_bucket].toss);
r->res_toss_time = jiffies; r->res_toss_time = jiffies;
ls->ls_rsbtbl[r->res_bucket].flags |= DLM_RTF_SHRINK;
if (r->res_lvbptr) { if (r->res_lvbptr) {
dlm_free_lvb(r->res_lvbptr); dlm_free_lvb(r->res_lvbptr);
r->res_lvbptr = NULL; r->res_lvbptr = NULL;
...@@ -1659,11 +1660,18 @@ static void shrink_bucket(struct dlm_ls *ls, int b) ...@@ -1659,11 +1660,18 @@ static void shrink_bucket(struct dlm_ls *ls, int b)
char *name; char *name;
int our_nodeid = dlm_our_nodeid(); int our_nodeid = dlm_our_nodeid();
int remote_count = 0; int remote_count = 0;
int need_shrink = 0;
int i, len, rv; int i, len, rv;
memset(&ls->ls_remove_lens, 0, sizeof(int) * DLM_REMOVE_NAMES_MAX); memset(&ls->ls_remove_lens, 0, sizeof(int) * DLM_REMOVE_NAMES_MAX);
spin_lock(&ls->ls_rsbtbl[b].lock); spin_lock(&ls->ls_rsbtbl[b].lock);
if (!(ls->ls_rsbtbl[b].flags & DLM_RTF_SHRINK)) {
spin_unlock(&ls->ls_rsbtbl[b].lock);
return;
}
for (n = rb_first(&ls->ls_rsbtbl[b].toss); n; n = next) { for (n = rb_first(&ls->ls_rsbtbl[b].toss); n; n = next) {
next = rb_next(n); next = rb_next(n);
r = rb_entry(n, struct dlm_rsb, res_hashnode); r = rb_entry(n, struct dlm_rsb, res_hashnode);
...@@ -1679,6 +1687,8 @@ static void shrink_bucket(struct dlm_ls *ls, int b) ...@@ -1679,6 +1687,8 @@ static void shrink_bucket(struct dlm_ls *ls, int b)
continue; continue;
} }
need_shrink = 1;
if (!time_after_eq(jiffies, r->res_toss_time + if (!time_after_eq(jiffies, r->res_toss_time +
dlm_config.ci_toss_secs * HZ)) { dlm_config.ci_toss_secs * HZ)) {
continue; continue;
...@@ -1710,6 +1720,11 @@ static void shrink_bucket(struct dlm_ls *ls, int b) ...@@ -1710,6 +1720,11 @@ static void shrink_bucket(struct dlm_ls *ls, int b)
rb_erase(&r->res_hashnode, &ls->ls_rsbtbl[b].toss); rb_erase(&r->res_hashnode, &ls->ls_rsbtbl[b].toss);
dlm_free_rsb(r); dlm_free_rsb(r);
} }
if (need_shrink)
ls->ls_rsbtbl[b].flags |= DLM_RTF_SHRINK;
else
ls->ls_rsbtbl[b].flags &= ~DLM_RTF_SHRINK;
spin_unlock(&ls->ls_rsbtbl[b].lock); spin_unlock(&ls->ls_rsbtbl[b].lock);
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment