[openib-general] [PATCH] at: pull sparse fixes from james's branch to shahar's

[Tom Duffy]

Hal,

Can you please pull the sparse fixes from James's branch to Shahar's?

svn diff -r2134:2238 gen2/users/jlentini/linux-kernel/patches/at.c

Or here it is against the latest r2278 in shaharf-ibat.

Signed-off-by: Tom Duffy <tduffy at sun.com>

Index: gen2/branches/shaharf-ibat/src/linux-kernel/infiniband/core/at.c
===================================================================
--- gen2/branches/shaharf-ibat/src/linux-kernel/infiniband/core/at.c	(revision 2278)
+++ gen2/branches/shaharf-ibat/src/linux-kernel/infiniband/core/at.c	(working copy)
@@ -132,7 +132,7 @@ struct async {
 	int sa_id;
 };
 
-struct async pending_reqs;	/* dummy head for cyclic list */
+static struct async pending_reqs;	/* dummy head for cyclic list */
 
 struct ib_at_src {
 	u32 ip;
@@ -711,7 +711,7 @@ static void req_free(struct async *pend)
 
 	pend->status = IB_AT_STATUS_INVALID;
 	pend->type = IBAT_REQ_NONE;
-	pend->sa_query = 0;
+	pend->sa_query = NULL;
 }
 
 static int req_start(struct async *q, struct async *pend,
@@ -727,7 +727,7 @@ static int req_start(struct async *q, st
 
 	if (parent) {
 		DEBUG("wait on parent %p", parent);
-		pend->next = pend->prev = 0;
+		pend->next = pend->prev = NULL;
 		pend->parent = parent;
 		pend->waiting = parent->waiting;
 		parent->waiting = pend;
@@ -735,8 +735,8 @@ static int req_start(struct async *q, st
 		return 0;	/* waiting on other request */
 	}
 
-	pend->waiting = 0;
-	pend->parent = 0;
+	pend->waiting = NULL;
+	pend->parent = NULL;
 
 	DEBUG("link to pending list %p", q);
 	pend->next = q;
@@ -787,7 +787,7 @@ static void req_end(struct async *pend, 
 		if (!*rr)
 			WARN("pending request not found in parent request!");
 
-		pend->waiting = 0;
+		pend->waiting = NULL;
 		DEBUG("child %p removed from parent %p list",
 			pend, pend->parent);
 	}
@@ -796,10 +796,10 @@ static void req_end(struct async *pend, 
 		DEBUG("pend %p ending child req %p", pend, waiting);
 		pend->waiting = waiting->waiting;
 
-		waiting->waiting = 0;
-		waiting->parent = 0;
+		waiting->waiting = NULL;
+		waiting->parent = NULL;
 
-		req_end(waiting, nrec, 0);
+		req_end(waiting, nrec, NULL);
 	}
 
 	if (pend->next) {
@@ -886,7 +886,7 @@ static struct async *lookup_pending(stru
 	}
 
 	spin_unlock_irqrestore(&q->lock, flags);
-	return a == q ? 0 : a;
+	return a == q ? NULL : a;
 }
 
 static struct async *lookup_req_id(struct async *q, u64 id)
@@ -901,7 +901,7 @@ static struct async *lookup_req_id(struc
 			break;
 
 	spin_unlock_irqrestore(&q->lock, flags);
-	return a == q ? 0 : a;
+	return a == q ? NULL : a;
 }
 
 static void flush_pending(struct async *q)
@@ -912,7 +912,7 @@ static void flush_pending(struct async *
 	DEBUG("flushing pening q %p", q);
 	spin_lock_irqsave(&q->lock, flags);
 	while ((a = q->next) != q)
-		req_end(a, -EINTR, 0);
+		req_end(a, -EINTR, NULL);
 	spin_unlock_irqrestore(&q->lock, flags);
 }
 
@@ -978,7 +978,7 @@ route_req_complete(struct route_req *req
 	for (pend = req->pend.waiting; pend; pend = pend->waiting)	
 		route_req_output(req, pend->data);
 
-	req_end(&req->pend, 1, 0);
+	req_end(&req->pend, 1, NULL);
 }
 
 static void
@@ -990,7 +990,7 @@ ats_route_req_complete(int status, struc
 
 	DEBUG("req %p", req);
 
-	req->pend.sa_query = 0;
+	req->pend.sa_query = NULL;
 
 	if (status) {
 		DEBUG("status %d - check if should retry", status);
@@ -1075,7 +1075,7 @@ path_req_complete(int status, struct ib_
 		pend->nelem = path_req_output(req, resp, 1,
 					      pend->data, pend->nelem);
 
-	req_end(&req->pend, req->pend.nelem, 0);
+	req_end(&req->pend, req->pend.nelem, NULL);
 	spin_unlock_irqrestore(&pending_reqs.lock, flags);
 }
 
@@ -1102,7 +1102,7 @@ static void ib_at_sweep(void *data)
 			     (req->dst_ip & 0xff000000) >> 24,
 			     jiffies, pend->start);
 
-			req_end(pend, -ETIMEDOUT, 0);
+			req_end(pend, -ETIMEDOUT, NULL);
 		}
 	}
 
@@ -1541,7 +1541,7 @@ int ib_at_cancel(u64 req_id)
 
 	/* Promote first child to be pending req */
 	if ((child = a->waiting)) {
-		child->parent = 0;
+		child->parent = NULL;
 
 		/* link child after parent in pending list */
 		child->next = a->next;
@@ -1549,10 +1549,10 @@ int ib_at_cancel(u64 req_id)
 		a->next->prev = child;
 		a->next = child;
 
-		a->waiting = 0;		/* clear to avoid cancelling childs */
+		a->waiting = NULL;	/* clear to avoid cancelling childs */
 	}
 
-	req_end(a, -EINTR, 0);
+	req_end(a, -EINTR, NULL);
 
 	spin_unlock_irqrestore(&pending_reqs.lock, flags);