Skip to contentSkip to conversation

dlm: remove extra blocking callback check

PATCH New David Teigland 1 participant 1 message Dec 23, 2008 Distributed lock manager (DLM)

lore
Share & tools
lore

David Teigland

author maintainer
#0 lore raw

PATCH 5/10 dlm: remove extra blocking callback check

Just before delivering a blocking callback (bast), the dlm_astd thread checks again that the granted mode of the lkb actually blocks the mode requested by the bast. The idea behind this was originally that the granted mode may have changed since the bast was queued, making the callback now unnecessary. Reasons for removing this extra check are:
- dlm_astd doesn't lock the rsb before reading the lkb grmode, so it's not technically safe (this removes the long standing FIXME)
- after running some tests, it doesn't appear the check ever actually eliminates a bast
- delivering an unnecessary blocking callback isn't a bad thing and can happen anyway

---
 fs/dlm/ast.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)
fs/dlm/ast.c +1 -6
index 30c11f3..09b167d 100644
@@ -89,13 +89,8 @@ static void process_asts(void)
 		if ((type & AST_COMP) && cast)
 			cast(lkb->lkb_astparam);
 
-		/* FIXME: Is it safe to look at lkb_grmode here
-		   without doing a lock_rsb() ?
-		   Look at other checks in v1 to avoid basts. */
-
 		if ((type & AST_BAST) && bast)
-			if (!dlm_modes_compat(lkb->lkb_grmode, bmode))
-				bast(lkb->lkb_astparam, bmode);
+			bast(lkb->lkb_astparam, bmode);
 
 		/* this removes the reference added by dlm_add_ast
 		   and may result in the lkb being freed */
Signature · 1 line
1.5.5.1