The patch titled
dlm: remove true false defines
has been removed from the -mm tree. Its filename is
dlm-recovery-remove-true-false-defines.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: David Teigland <teigland@xxxxxxxxxx>
Replace TRUE/FALSE with 1/0.
Signed-off-by: David Teigland <teigland@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
Cc: Steven Whitehouse <swhiteho@xxxxxxxxxx>
---
drivers/dlm/ast.c | 4 +-
drivers/dlm/dir.c | 4 +-
drivers/dlm/dlm_internal.h | 8 -----
drivers/dlm/lock.c | 54 +++++++++++++++++------------------
drivers/dlm/member.c | 12 +++----
drivers/dlm/midcomms.c | 2 -
drivers/dlm/recover.c | 16 +++++-----
drivers/dlm/requestqueue.c | 2 -
8 files changed, 47 insertions(+), 55 deletions(-)
diff -puN drivers/dlm/ast.c~dlm-recovery-remove-true-false-defines drivers/dlm/ast.c
--- devel/drivers/dlm/ast.c~dlm-recovery-remove-true-false-defines 2006-02-21 13:35:24.000000000 -0800
+++ devel-akpm/drivers/dlm/ast.c 2006-02-21 13:35:24.000000000 -0800
@@ -55,7 +55,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;
@@ -67,7 +67,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);
diff -puN drivers/dlm/dir.c~dlm-recovery-remove-true-false-defines drivers/dlm/dir.c
--- devel/drivers/dlm/dir.c~dlm-recovery-remove-true-false-defines 2006-02-21 13:35:24.000000000 -0800
+++ devel-akpm/drivers/dlm/dir.c 2006-02-21 13:35:24.000000000 -0800
@@ -32,7 +32,7 @@ static void put_free_de(struct dlm_ls *l
static 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);
@@ -41,7 +41,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;
}
}
diff -puN drivers/dlm/dlm_internal.h~dlm-recovery-remove-true-false-defines drivers/dlm/dlm_internal.h
--- devel/drivers/dlm/dlm_internal.h~dlm-recovery-remove-true-false-defines 2006-02-21 13:35:24.000000000 -0800
+++ devel-akpm/drivers/dlm/dlm_internal.h 2006-02-21 13:35:24.000000000 -0800
@@ -41,14 +41,6 @@
#define DLM_LOCKSPACE_LEN 64
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-
/* Size of the temp buffer midcomms allocates on the stack.
We try to make this large enough so most messages fit.
FIXME: should sctp make this unnecessary? */
diff -puN drivers/dlm/lock.c~dlm-recovery-remove-true-false-defines drivers/dlm/lock.c
--- devel/drivers/dlm/lock.c~dlm-recovery-remove-true-false-defines 2006-02-21 13:35:24.000000000 -0800
+++ devel-akpm/drivers/dlm/lock.c 2006-02-21 13:35:24.000000000 -0800
@@ -214,15 +214,15 @@ static inline int is_master_copy(struct
{
if (lkb->lkb_flags & DLM_IFL_MSTCPY)
DLM_ASSERT(lkb->lkb_nodeid, dlm_print_lkb(lkb););
- return (lkb->lkb_flags & DLM_IFL_MSTCPY) ? TRUE : FALSE;
+ return (lkb->lkb_flags & DLM_IFL_MSTCPY) ? 1 : 0;
}
static inline int middle_conversion(struct dlm_lkb *lkb)
{
if ((lkb->lkb_grmode==DLM_LOCK_PR && lkb->lkb_rqmode==DLM_LOCK_CW) ||
(lkb->lkb_rqmode==DLM_LOCK_PR && lkb->lkb_grmode==DLM_LOCK_CW))
- return TRUE;
- return FALSE;
+ return 1;
+ return 0;
}
static inline int down_conversion(struct dlm_lkb *lkb)
@@ -764,14 +764,14 @@ static int shrink_bucket(struct dlm_ls *
int count = 0, found;
for (;;) {
- found = FALSE;
+ found = 0;
write_lock(&ls->ls_rsbtbl[b].lock);
list_for_each_entry_reverse(r, &ls->ls_rsbtbl[b].toss,
res_hashchain) {
if (!time_after_eq(jiffies, r->res_toss_time +
dlm_config.toss_secs * HZ))
continue;
- found = TRUE;
+ found = 1;
break;
}
@@ -1016,9 +1016,9 @@ static inline int first_in_list(struct d
struct dlm_lkb *first = list_entry(head->next, struct dlm_lkb,
lkb_statequeue);
if (lkb->lkb_id == first->lkb_id)
- return TRUE;
+ return 1;
- return FALSE;
+ return 0;
}
/* Return 1 if the locks' ranges overlap. If the lkb has no range then it is
@@ -1027,13 +1027,13 @@ static inline int first_in_list(struct d
static inline int ranges_overlap(struct dlm_lkb *lkb1, struct dlm_lkb *lkb2)
{
if (!lkb1->lkb_range || !lkb2->lkb_range)
- return TRUE;
+ return 1;
if (lkb1->lkb_range[RQ_RANGE_END] < lkb2->lkb_range[GR_RANGE_START] ||
lkb1->lkb_range[RQ_RANGE_START] > lkb2->lkb_range[GR_RANGE_END])
- return FALSE;
+ return 0;
- return TRUE;
+ return 1;
}
/* Check if the given lkb conflicts with another lkb on the queue. */
@@ -1046,9 +1046,9 @@ static int queue_conflict(struct list_he
if (this == lkb)
continue;
if (ranges_overlap(lkb, this) && !modes_compat(this, lkb))
- return TRUE;
+ return 1;
}
- return FALSE;
+ return 0;
}
/*
@@ -1092,7 +1092,7 @@ static int conversion_deadlock_detect(st
continue;
if (!modes_compat(this, lkb) && !modes_compat(lkb, this))
- return TRUE;
+ return 1;
}
/* if lkb is on the convert queue and is preventing the first
@@ -1103,10 +1103,10 @@ static int conversion_deadlock_detect(st
if (self && self != first) {
if (!modes_compat(lkb, first) &&
!queue_conflict(&rsb->res_grantqueue, first))
- return TRUE;
+ return 1;
}
- return FALSE;
+ return 0;
}
/*
@@ -1146,7 +1146,7 @@ static int _can_be_granted(struct dlm_rs
*/
if (lkb->lkb_exflags & DLM_LKF_EXPEDITE)
- return TRUE;
+ return 1;
/*
* A shortcut. Without this, !queue_conflict(grantqueue, lkb) would be
@@ -1189,7 +1189,7 @@ static int _can_be_granted(struct dlm_rs
*/
if (now && conv && !(lkb->lkb_exflags & DLM_LKF_QUECVT))
- return TRUE;
+ return 1;
/*
* When using range locks the NOORDER flag is set to avoid the standard
@@ -1197,7 +1197,7 @@ static int _can_be_granted(struct dlm_rs
*/
if (lkb->lkb_exflags & DLM_LKF_NOORDER)
- return TRUE;
+ return 1;
/*
* 6-3: Once in that queue [CONVERTING], a conversion request cannot be
@@ -1206,7 +1206,7 @@ static int _can_be_granted(struct dlm_rs
*/
if (!now && conv && first_in_list(lkb, &r->res_convertqueue))
- return TRUE;
+ return 1;
/*
* 6-4: By default, a new request is immediately granted only if all
@@ -1221,7 +1221,7 @@ static int _can_be_granted(struct dlm_rs
if (now && !conv && list_empty(&r->res_convertqueue) &&
list_empty(&r->res_waitqueue))
- return TRUE;
+ return 1;
/*
* 6-4: Once a lock request is in the queue of ungranted new requests,
@@ -1233,7 +1233,7 @@ static int _can_be_granted(struct dlm_rs
if (!now && !conv && list_empty(&r->res_convertqueue) &&
first_in_list(lkb, &r->res_waitqueue))
- return TRUE;
+ return 1;
out:
/*
@@ -1246,7 +1246,7 @@ static int _can_be_granted(struct dlm_rs
lkb->lkb_sbflags |= DLM_SBF_DEMOTED;
}
- return FALSE;
+ return 0;
}
/*
@@ -1297,7 +1297,7 @@ static int grant_pending_convert(struct
list_for_each_entry_safe(lkb, s, &r->res_convertqueue, lkb_statequeue) {
demoted = is_demoted(lkb);
- if (can_be_granted(r, lkb, FALSE)) {
+ if (can_be_granted(r, lkb, 0)) {
grant_lock_pending(r, lkb);
grant_restart = 1;
} else {
@@ -1322,7 +1322,7 @@ static int grant_pending_wait(struct dlm
struct dlm_lkb *lkb, *s;
list_for_each_entry_safe(lkb, s, &r->res_waitqueue, lkb_statequeue) {
- if (can_be_granted(r, lkb, FALSE))
+ if (can_be_granted(r, lkb, 0))
grant_lock_pending(r, lkb);
else
high = max_t(int, lkb->lkb_rqmode, high);
@@ -1723,7 +1723,7 @@ static int do_request(struct dlm_rsb *r,
{
int error = 0;
- if (can_be_granted(r, lkb, TRUE)) {
+ if (can_be_granted(r, lkb, 1)) {
grant_lock(r, lkb);
queue_cast(r, lkb, 0);
goto out;
@@ -1751,7 +1751,7 @@ static int do_convert(struct dlm_rsb *r,
/* changing an existing lock may allow others to be granted */
- if (can_be_granted(r, lkb, TRUE)) {
+ if (can_be_granted(r, lkb, 1)) {
grant_lock(r, lkb);
queue_cast(r, lkb, 0);
grant_pending_locks(r);
@@ -2572,7 +2572,7 @@ static void receive_convert(struct dlm_l
{
struct dlm_lkb *lkb;
struct dlm_rsb *r;
- int error, reply = TRUE;
+ int error, reply = 1;
error = find_lkb(ls, ms->m_remid, &lkb);
if (error)
diff -puN drivers/dlm/member.c~dlm-recovery-remove-true-false-defines drivers/dlm/member.c
--- devel/drivers/dlm/member.c~dlm-recovery-remove-true-false-defines 2006-02-21 13:35:24.000000000 -0800
+++ devel-akpm/drivers/dlm/member.c 2006-02-21 13:35:24.000000000 -0800
@@ -73,9 +73,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)
@@ -84,9 +84,9 @@ int dlm_is_removed(struct dlm_ls *ls, in
list_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)
@@ -160,10 +160,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;
}
}
diff -puN drivers/dlm/midcomms.c~dlm-recovery-remove-true-false-defines drivers/dlm/midcomms.c
--- devel/drivers/dlm/midcomms.c~dlm-recovery-remove-true-false-defines 2006-02-21 13:35:24.000000000 -0800
+++ devel-akpm/drivers/dlm/midcomms.c 2006-02-21 13:35:24.000000000 -0800
@@ -118,7 +118,7 @@ int dlm_process_incoming_buffer(int node
switch (msg->h_cmd) {
case DLM_MSG:
- dlm_receive_message(msg, nodeid, FALSE);
+ dlm_receive_message(msg, nodeid, 0);
break;
case DLM_RCOM:
diff -puN drivers/dlm/recover.c~dlm-recovery-remove-true-false-defines drivers/dlm/recover.c
--- devel/drivers/dlm/recover.c~dlm-recovery-remove-true-false-defines 2006-02-21 13:35:24.000000000 -0800
+++ devel-akpm/drivers/dlm/recover.c 2006-02-21 13:35:24.000000000 -0800
@@ -446,8 +446,8 @@ static int all_queues_empty(struct dlm_r
if (!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)
@@ -555,18 +555,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;
}
@@ -580,10 +580,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;
}
diff -puN drivers/dlm/requestqueue.c~dlm-recovery-remove-true-false-defines drivers/dlm/requestqueue.c
--- devel/drivers/dlm/requestqueue.c~dlm-recovery-remove-true-false-defines 2006-02-21 13:35:24.000000000 -0800
+++ devel-akpm/drivers/dlm/requestqueue.c 2006-02-21 13:35:24.000000000 -0800
@@ -67,7 +67,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 */
_
Patches currently in -mm which might be from teigland@xxxxxxxxxx are
git-gfs2.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
