@@ -1878,7 +1878,6 @@ static void mptcp_worker(struct work_struct *work)
int state, ret;
lock_sock(sk);
- set_bit(MPTCP_WORKER_RUNNING, &msk->flags);
state = sk->sk_state;
if (unlikely(state == TCP_CLOSE))
goto unlock;
@@ -1955,7 +1954,6 @@ static void mptcp_worker(struct work_struct *work)
mptcp_reset_timer(sk);
unlock:
- clear_bit(MPTCP_WORKER_RUNNING, &msk->flags);
release_sock(sk);
sock_put(sk);
}
@@ -2031,11 +2029,7 @@ static void mptcp_cancel_work(struct sock *sk)
{
struct mptcp_sock *msk = mptcp_sk(sk);
- /* if called by the work itself, do not try to cancel the work, or
- * we will hang.
- */
- if (!test_bit(MPTCP_WORKER_RUNNING, &msk->flags) &&
- cancel_work_sync(&msk->work))
+ if (cancel_work_sync(&msk->work))
__sock_put(sk);
}
@@ -91,7 +91,6 @@
#define MPTCP_WORK_EOF 3
#define MPTCP_FALLBACK_DONE 4
#define MPTCP_WORK_CLOSE_SUBFLOW 5
-#define MPTCP_WORKER_RUNNING 6
static inline bool before64(__u64 seq1, __u64 seq2)
{
Only mptcp_close() can actually cancel the workqueue, no need to add and use this flag. Signed-off-by: Paolo Abeni <pabeni@redhat.com> --- Note: this one should land on the bottom of export branch, just on top of net-next branch --- net/mptcp/protocol.c | 8 +------- net/mptcp/protocol.h | 1 - 2 files changed, 1 insertion(+), 8 deletions(-)