Commit 46d6e722 authored by Alexander Aring's avatar Alexander Aring Committed by David Teigland
Browse files

fs: dlm: rsb hash table flag value to atomic ops 



This patch moves the rsb hash table handling to atomic flag operations.
The flag operations for DLM_RTF_SHRINK are protected by
ls->ls_rsbtbl[b].lock. However we switch to atomic ops if new possible
flags will be used in a different way and don't assume such lock
dependencies.

Signed-off-by: default avatarAlexander Aring <aahringo@redhat.com>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent e1af8728

fs/dlm/dlm_internal.h

+2 −2
Original line number Diff line number Diff line
@@ -99,13 +99,13 @@ do { \ 
}





#define DLM_RTF_SHRINK		0x00000001

#define DLM_RTF_SHRINK_BIT	0



struct dlm_rsbtable {

	struct rb_root		keep;

	struct rb_root		toss;

	spinlock_t		lock;

	uint32_t		flags;

	unsigned long		flags;

};

fs/dlm/lock.c

+4 −4
Original line number Diff line number Diff line
@@ -1139,7 +1139,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;

	set_bit(DLM_RTF_SHRINK_BIT, &ls->ls_rsbtbl[r->res_bucket].flags);

	if (r->res_lvbptr) {

		dlm_free_lvb(r->res_lvbptr);

		r->res_lvbptr = NULL;
@@ -1588,7 +1588,7 @@ static void shrink_bucket(struct dlm_ls *ls, int b) 


	spin_lock(&ls->ls_rsbtbl[b].lock);



	if (!(ls->ls_rsbtbl[b].flags & DLM_RTF_SHRINK)) {

	if (!test_bit(DLM_RTF_SHRINK_BIT, &ls->ls_rsbtbl[b].flags)) {

		spin_unlock(&ls->ls_rsbtbl[b].lock);

		return;

	}
@@ -1643,9 +1643,9 @@ static void shrink_bucket(struct dlm_ls *ls, int b) 
	}



	if (need_shrink)

		ls->ls_rsbtbl[b].flags |= DLM_RTF_SHRINK;

		set_bit(DLM_RTF_SHRINK_BIT, &ls->ls_rsbtbl[b].flags);

	else

		ls->ls_rsbtbl[b].flags &= ~DLM_RTF_SHRINK;

		clear_bit(DLM_RTF_SHRINK_BIT, &ls->ls_rsbtbl[b].flags);

	spin_unlock(&ls->ls_rsbtbl[b].lock);



	/*