dlm: remove true false defines
PATCH 4/7 dlm: remove true false defines
Replace TRUE/FALSE with 1/0.
Signed-off-by David Teigland <[email protected]>
drivers/dlm/ast.c +2 -2
@@ -56,7 +56,7 @@ static void process_asts(void)int type =0 , found, bmode;for (;;) { - found = FALSE; + found =0 ;spin_lock (&ast_queue_lock);list_for_each_entry (lkb, &ast_queue, lkb_astqueue) { r = lkb->lkb_resource;
@@ -68,7 +68,7 @@ static void process_asts(void)list_del (&lkb->lkb_astqueue); type = lkb->lkb_ast_type; lkb->lkb_ast_type =0 ; - found = TRUE; + found =1 ;break ; }spin_unlock (&ast_queue_lock);
drivers/dlm/dir.c +2 -2
@@ -33,7 +33,7 @@ static void put_free_de(struct dlm_ls *lstatic struct dlm_direntry *get_free_de (struct dlm_ls *ls,int len) { -int found = FALSE; +int found =0 ;struct dlm_direntry *de;spin_lock (&ls->ls_recover_list_lock);
@@ -42,7 +42,7 @@ static struct dlm_direntry *get_free_de(list_del (&de->list); de->master_nodeid =0 ;memset (de->name,0 , len); - found = TRUE; + found =1 ;break ; } }
drivers/dlm/dlm_internal.h +0 -8
@@ -42,14 +42,6 @@#define DLM_LOCKSPACE_LEN 64 -#ifndef TRUE -#define TRUE 1 -#endif - -#ifndef FALSE -#define FALSE 0 -#endif -#if (BITS_PER_LONG ==64 )#define PRIx64 "lx"#else
drivers/dlm/lock.c +27 -27
188 lines not on this page · raw message
drivers/dlm/member.c +6 -6
@@ -79,9 +79,9 @@ static int dlm_is_member(struct dlm_ls *list_for_each_entry (memb, &ls->ls_nodes, list) {if (memb->nodeid == nodeid) -return TRUE; +return 1 ; } -return FALSE; +return 0 ; }int dlm_is_removed (struct dlm_ls *ls,int nodeid)
@@ -90,9 +90,9 @@ int dlm_is_removed(struct dlm_ls *ls, inlist_for_each_entry (memb, &ls->ls_nodes_gone, list) {if (memb->nodeid == nodeid) -return TRUE; +return 1 ; } -return FALSE; +return 0 ; }static void clear_memb_list (struct list_head *head)
@@ -178,10 +178,10 @@ int dlm_recover_members(struct dlm_ls *l/* move departed members from ls_nodes to ls_nodes_gone */ list_for_each_entry_safe (memb, safe, &ls->ls_nodes, list) { - found = FALSE; + found =0 ;for (i =0 ; i < rv->node_count; i++) {if (memb->nodeid == rv->nodeids[i]) { - found = TRUE; + found =1 ;break ; } }
drivers/dlm/midcomms.c +1 -1
@@ -119,7 +119,7 @@ int dlm_process_incoming_buffer(int nodeswitch (msg->h_cmd) {case DLM_MSG : -dlm_receive_message (msg, nodeid, FALSE); +dlm_receive_message (msg, nodeid,0 );break ;case DLM_RCOM :
drivers/dlm/recover.c +8 -8
@@ -477,8 +477,8 @@ static int all_queues_empty(struct dlm_rif (!list_empty (&r->res_grantqueue) || !list_empty (&r->res_convertqueue) || !list_empty (&r->res_waitqueue)) -return FALSE; -return TRUE; +return 0 ; +return 1 ; }static int recover_locks (struct dlm_rsb *r)
@@ -586,18 +586,18 @@ static void recover_lvb(struct dlm_rsb * {struct dlm_lkb *lkb, *high_lkb =NULL ;uint32_t high_seq =0 ; -int lock_lvb_exists = FALSE; -int big_lock_exists = FALSE; +int lock_lvb_exists =0 ; +int big_lock_exists =0 ;int lvblen = r->res_ls->ls_lvblen;list_for_each_entry (lkb, &r->res_grantqueue, lkb_statequeue) {if (!(lkb->lkb_exflags &DLM_LKF_VALBLK ))continue ; - lock_lvb_exists = TRUE; + lock_lvb_exists =1 ;if (lkb->lkb_grmode >DLM_LOCK_CR ) { - big_lock_exists = TRUE; + big_lock_exists =1 ; goto setflag; }
@@ -611,10 +611,10 @@ static void recover_lvb(struct dlm_rsb *if (!(lkb->lkb_exflags &DLM_LKF_VALBLK ))continue ; - lock_lvb_exists = TRUE; + lock_lvb_exists =1 ;if (lkb->lkb_grmode >DLM_LOCK_CR ) { - big_lock_exists = TRUE; + big_lock_exists =1 ; goto setflag; }
drivers/dlm/requestqueue.c +1 -1
@@ -70,7 +70,7 @@ int dlm_process_requestqueue(struct dlm_up (&ls->ls_requestqueue_lock); hd = (struct dlm_header *) e->request; - error =dlm_receive_message (hd, e->nodeid, TRUE); + error =dlm_receive_message (hd, e->nodeid,1 );if (error == -EINTR ) {/* entry is left on requestqueue */