diff options
| author | Bart Van Assche <bvanassche@acm.org> | 2014-03-14 13:53:10 +0100 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2014-03-24 10:05:31 -0700 |
| commit | a702adceec3eeee23d95a81a0663661e7c25ad9c (patch) | |
| tree | 815a42566f0576b7921d36df89e0eda8c55d9eec /drivers/infiniband/ulp | |
| parent | 2d7091bcf6f893a9b1a2add357c637055eae4e68 (diff) | |
| download | blackbird-op-linux-a702adceec3eeee23d95a81a0663661e7c25ad9c.tar.gz blackbird-op-linux-a702adceec3eeee23d95a81a0663661e7c25ad9c.zip | |
IB/srp: Make writing into the "add_target" sysfs attribute interruptible
Avoid that stopping srp_daemon takes unusually long due to a cable
pull by making writing into the "add_target" sysfs attribute
interruptible.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/ulp')
| -rw-r--r-- | drivers/infiniband/ulp/srp/ib_srp.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index 3294f10316a0..481c873f735e 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -411,6 +411,8 @@ static void srp_path_rec_completion(int status, static int srp_lookup_path(struct srp_target_port *target) { + int ret; + target->path.numb_path = 1; init_completion(&target->done); @@ -431,7 +433,9 @@ static int srp_lookup_path(struct srp_target_port *target) if (target->path_query_id < 0) return target->path_query_id; - wait_for_completion(&target->done); + ret = wait_for_completion_interruptible(&target->done); + if (ret < 0) + return ret; if (target->status < 0) shost_printk(KERN_WARNING, target->scsi_host, @@ -710,7 +714,9 @@ static int srp_connect_target(struct srp_target_port *target) ret = srp_send_req(target); if (ret) return ret; - wait_for_completion(&target->done); + ret = wait_for_completion_interruptible(&target->done); + if (ret < 0) + return ret; /* * The CM event handling code will set status to |
