diff options
| author | Mike Christie <michaelc@cs.wisc.edu> | 2013-06-14 04:56:11 -0500 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2013-06-14 13:07:11 -0500 |
| commit | b390ca38d27bd3d2f409e64a6f13d6ff67eb4825 (patch) | |
| tree | 18628a77b6dd6bc456d66b10f36aa751481d5936 | |
| parent | e1631d0c48ca5ba9878f5923ffe58ef6fd2d5fda (diff) | |
| download | linux-b390ca38d27bd3d2f409e64a6f13d6ff67eb4825.tar.gz linux-b390ca38d27bd3d2f409e64a6f13d6ff67eb4825.tar.bz2 linux-b390ca38d27bd3d2f409e64a6f13d6ff67eb4825.zip | |
dlm: clear correct bit during sctp init failure handling
We should be testing and cleaing the init pending bit because later
when sctp_init_assoc is recalled it will be checking that it is not set
and set the bit.
We do not want to touch CF_CONNECT_PENDING here because we will queue
swork and process_send_sockets will then call the connect_action function.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: David Teigland <teigland@redhat.com>
| -rw-r--r-- | fs/dlm/lowcomms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index 1536599fde8c..87e68dd01479 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c @@ -562,7 +562,7 @@ static void sctp_send_shutdown(sctp_assoc_t associd) static void sctp_init_failed_foreach(struct connection *con) { con->sctp_assoc = 0; - if (test_and_clear_bit(CF_CONNECT_PENDING, &con->flags)) { + if (test_and_clear_bit(CF_INIT_PENDING, &con->flags)) { if (!test_and_set_bit(CF_WRITE_PENDING, &con->flags)) queue_work(send_workqueue, &con->swork); } |