dlm: proper types for asts and basts
David Teigland
maintainerPATCH 14/16 dlm: proper types for asts and basts
Use proper types for ast and bast functions, and use consistent type for ast param.
Signed-off-by David Teigland <[email protected]>
--- fs/dlm/ast.c | 9 +++---- fs/dlm/dlm_internal.h | 14 +++++------- fs/dlm/lock.c | 50 +++++++++++++++++++++++++++++++----------------- fs/dlm/rcom.c | 4 +- 4 files changed, 44 insertions(+), 33 deletions(-)
fs/dlm/ast.c +4 -5
@@ -39,7 +39,6 @@ void dlm_add_ast(struct dlm_lkb *lkb, int type)dlm_user_add_ast (lkb, type);return ; } - DLM_ASSERT(lkb->lkb_astaddr != DLM_FAKE_USER_AST, dlm_print_lkb(lkb););spin_lock (&ast_queue_lock);if (!(lkb->lkb_ast_type & (AST_COMP |AST_BAST ))) {
@@ -58,8 +57,8 @@ static void process_asts(void)struct dlm_ls *ls =NULL ;struct dlm_rsb *r =NULL ;struct dlm_lkb *lkb; -void (*cast) (long param); -void (*bast) (long param,int mode); +void (*cast) (void *astparam); +void (*bast) (void *astparam,int mode);int type =0 , found, bmode;for (;;) {
@@ -83,8 +82,8 @@ static void process_asts(void)if (!found)break ; - cast = lkb->lkb_astaddr; - bast = lkb->lkb_bastaddr; + cast = lkb->lkb_astfn; + bast = lkb->lkb_bastfn; bmode = lkb->lkb_bastmode;if ((type &AST_COMP ) && cast)
fs/dlm/dlm_internal.h +6 -8
@@ -92,8 +92,6 @@ do { \ } \ } -#define DLM_FAKE_USER_AST ERR_PTR(-EINVAL) -struct dlm_direntry {struct list_head list;
@@ -146,9 +144,9 @@ struct dlm_recover {struct dlm_args {uint32_t flags; -void *astaddr; -long astparam; -void *bastaddr; +void (*astfn) (void *astparam); +void *astparam; +void (*bastfn) (void *astparam,int mode);int mode;struct dlm_lksb *lksb;unsigned long timeout;
@@ -253,9 +251,9 @@ struct dlm_lkb {char *lkb_lvbptr;struct dlm_lksb *lkb_lksb;/* caller's status block */ -void *lkb_astaddr;/* caller's ast function */ -void *lkb_bastaddr;/* caller's bast function */ -long lkb_astparam;/* caller's ast arg */ +void (*lkb_astfn) (void *astparam); +void (*lkb_bastfn) (void *astparam,int mode); +void *lkb_astparam;/* caller's ast arg */ };
fs/dlm/lock.c +32 -18
124 lines not on this page · raw message
fs/dlm/rcom.c +2 -2
@@ -318,9 +318,9 @@ static void pack_rcom_lock(struct dlm_rsb *r, struct dlm_lkb *lkb, rl->rl_status = lkb->lkb_status; rl->rl_wait_type =cpu_to_le16 (lkb->lkb_wait_type); -if (lkb->lkb_bastaddr) +if (lkb->lkb_bastfn) rl->rl_asts |=AST_BAST ; -if (lkb->lkb_astaddr) +if (lkb->lkb_astfn) rl->rl_asts |=AST_COMP ; rl->rl_namelen =cpu_to_le16 (r->res_length);
Signature · 1 line
1.5.3.3