mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
dlm for 3.9
This includes a single patch to avoid excessive and unnecessary scanning of rsbs to free. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJREX6ZAAoJEDgbc8f8gGmqDJ4QAKFuq+vwBb+21lNVDk1egBTf nDcpuntzZfnqgg+VKC5LJm0bBAvgexH2GrQMIPDFPPMgAOFjTxXDvm93wVGeAK6d JpkiZxW1a0lyjR+7NMvDFnoIdVJvKw+GezNITiVo/lMghl51NWOQTH8QmSBKdEdJ cxwzm/ZV9gBS5bv5hfeq2hCDVD1q5jWohMjYHb+xyx2E/c4z8L8enEMR1yBBrB/4 qw3DgGRMc0eoWzZrXKt1F6MYtM8QnU/H+WxxmLUYc4SMbClIonivAzzOa0PHO5nV YvewWwpo2VVT50EIxARXi0XQzJ0aYbTwo+E7KoG+MzK5sCmLJaP8inH5UnlltvEu OyhZUkh7qPNjhUQokP3FlNWidZkZNM+gJW6hmZwXtSGfGH6pe620QBrbghcV3nCh QXyENcKUcyDNJQSBQFKV/s4ql4RI+iDS3PfovyOdNqkEDWurWKx0AYcrn2dSNYt1 wjFPH94P3NOwz4nIabpYiICrEPXLdXw+CCvHz56DgBL7EFzrWAzC97v5arYpouhZ NmsnzV8+PGHDWA+NM73fKGokW259pvk/zOPtM13zoyXP18X6adGKUqMpZA7jZge9 RHzO/+A+3ScMXaXdb3c2P7GYH/iSSJXBmcTg8BceOYxICTq1wh4HEzvm39vEwMop 3BMloPmzKxzfis69swIu =WtiV -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
850cb82b75
2 changed files with 18 additions and 0 deletions
|
@ -96,10 +96,13 @@ do { \
|
|||
}
|
||||
|
||||
|
||||
#define DLM_RTF_SHRINK 0x00000001
|
||||
|
||||
struct dlm_rsbtable {
|
||||
struct rb_root keep;
|
||||
struct rb_root toss;
|
||||
spinlock_t lock;
|
||||
uint32_t flags;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -1132,6 +1132,7 @@ static void toss_rsb(struct kref *kref)
|
|||
rb_erase(&r->res_hashnode, &ls->ls_rsbtbl[r->res_bucket].keep);
|
||||
rsb_insert(r, &ls->ls_rsbtbl[r->res_bucket].toss);
|
||||
r->res_toss_time = jiffies;
|
||||
ls->ls_rsbtbl[r->res_bucket].flags |= DLM_RTF_SHRINK;
|
||||
if (r->res_lvbptr) {
|
||||
dlm_free_lvb(r->res_lvbptr);
|
||||
r->res_lvbptr = NULL;
|
||||
|
@ -1659,11 +1660,18 @@ static void shrink_bucket(struct dlm_ls *ls, int b)
|
|||
char *name;
|
||||
int our_nodeid = dlm_our_nodeid();
|
||||
int remote_count = 0;
|
||||
int need_shrink = 0;
|
||||
int i, len, rv;
|
||||
|
||||
memset(&ls->ls_remove_lens, 0, sizeof(int) * DLM_REMOVE_NAMES_MAX);
|
||||
|
||||
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) {
|
||||
next = rb_next(n);
|
||||
r = rb_entry(n, struct dlm_rsb, res_hashnode);
|
||||
|
@ -1679,6 +1687,8 @@ static void shrink_bucket(struct dlm_ls *ls, int b)
|
|||
continue;
|
||||
}
|
||||
|
||||
need_shrink = 1;
|
||||
|
||||
if (!time_after_eq(jiffies, r->res_toss_time +
|
||||
dlm_config.ci_toss_secs * HZ)) {
|
||||
continue;
|
||||
|
@ -1710,6 +1720,11 @@ static void shrink_bucket(struct dlm_ls *ls, int b)
|
|||
rb_erase(&r->res_hashnode, &ls->ls_rsbtbl[b].toss);
|
||||
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);
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue