diff options
| author | Sagi Grimberg <sagig@mellanox.com> | 2014-05-19 17:44:22 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-30 20:09:44 -0700 |
| commit | 3ddb875488bd3f4698199fd8ecd6ce8bb9b5c609 (patch) | |
| tree | 8cfc12c42635b8f62f7503cbfcd55eb1771be4e5 /drivers/infiniband | |
| parent | 8d26d1a24bd8523902d8987a9b69462380c70fc3 (diff) | |
| download | linux-3.10-3ddb875488bd3f4698199fd8ecd6ce8bb9b5c609.tar.gz linux-3.10-3ddb875488bd3f4698199fd8ecd6ce8bb9b5c609.tar.bz2 linux-3.10-3ddb875488bd3f4698199fd8ecd6ce8bb9b5c609.zip | |
Target/iser: Bail from accept_np if np_thread is trying to close
commit e346ab343f4f58c12a96725c7b13df9cc2ad56f6 upstream.
In case np_thread state is in RESET/SHUTDOWN/EXIT states,
no point for isert to stall there as we may get a hang in
case no one will wake it up later.
Signed-off-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/ulp/isert/ib_isert.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c index 14499991802..c5aeab06acc 100644 --- a/drivers/infiniband/ulp/isert/ib_isert.c +++ b/drivers/infiniband/ulp/isert/ib_isert.c @@ -2190,9 +2190,14 @@ accept_wait: return -ENODEV; spin_lock_bh(&np->np_thread_lock); - if (np->np_thread_state == ISCSI_NP_THREAD_RESET) { + if (np->np_thread_state >= ISCSI_NP_THREAD_RESET) { spin_unlock_bh(&np->np_thread_lock); - pr_debug("ISCSI_NP_THREAD_RESET for isert_accept_np\n"); + pr_debug("np_thread_state %d for isert_accept_np\n", + np->np_thread_state); + /** + * No point in stalling here when np_thread + * is in state RESET/SHUTDOWN/EXIT - bail + **/ return -ENODEV; } spin_unlock_bh(&np->np_thread_lock); |