From 87355b4423215b54216049493002831df38d9a4d Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 21 Feb 2013 17:16:54 +0000 Subject: [PATCH] --- yaml --- r: 358887 b: refs/heads/master c: e1b2f13aba9ff714d23ecd4a950e744ee7ad72e1 h: refs/heads/master i: 358885: f01a5acc9c4d3f18c1e9186584a5580f4aa9ac33 358883: 02bc493dcb7b53ac6a821bd99c8e5ec9ac52e52d 358879: ab96524c74f82f5e241c13934a4a7d399e0936fd v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/qib/qib_qp.c | 5 ++--- trunk/drivers/infiniband/ulp/srp/ib_srp.c | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 176276af1e51..9a9ac78f2e8a 100644 --- 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 index a6a2cc2ba260..35275099cafd 100644 --- 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 index d5088ce78290..94f76b9319c1 100644 --- 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);