---

yaml --- r: 358887 b: refs/heads/master c: e1b2f13 h: refs/heads/master i: 358885: f01a5ac 358883: 02bc493 358879: ab96524 v: v3
git-mirror · Feb 25, 2013 · 87355b4 · 87355b4
1 parent b1701d4
commit 87355b4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcc9b67a5b65ec2e1ec5371226a729ec1b380860
+refs/heads/master: e1b2f13aba9ff714d23ecd4a950e744ee7ad72e1
diff --git a/trunk/drivers/infiniband/hw/qib/qib_qp.c b/trunk/drivers/infiniband/hw/qib/qib_qp.c
@@ -268,9 +268,8 @@ static void remove_qp(struct qib_ibdev *dev, struct qib_qp *qp)
 				qpp = &q->next)
 			if (q == qp) {
 				atomic_dec(&qp->refcount);
-				rcu_assign_pointer(*qpp,
-					rcu_dereference_protected(qp->next,
-					 lockdep_is_held(&dev->qpt_lock)));
+				*qpp = qp->next;
+				rcu_assign_pointer(qp->next, NULL);
 				break;
 			}
 	}

diff --git a/trunk/drivers/infiniband/ulp/srp/ib_srp.c b/trunk/drivers/infiniband/ulp/srp/ib_srp.c
@@ -1972,7 +1972,6 @@ static int srp_add_target(struct srp_host *host, struct srp_target_port *target)
 	spin_unlock(&host->target_lock);
 
 	target->state = SRP_TARGET_LIVE;
-	target->connected = false;
 
 	scsi_scan_target(&target->scsi_host->shost_gendev,
 			 0, target->scsi_id, SCAN_WILD_CARD, 0);