Commit 83c47d9e authored by Marios Makassikis's avatar Marios Makassikis Committed by Steve French
Browse files

ksmbd: count all requests in req_running counter 



This changes the semantics of req_running to count all in-flight
requests on a given connection, rather than the number of elements
in the conn->request list. The latter is used only in smb2_cancel,
and the counter is not used

Signed-off-by: default avatarMarios Makassikis <mmakassikis@freebox.fr>
Acked-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 78d4f34e

fs/smb/server/connection.c

+3 −2
Original line number Diff line number Diff line
@@ -120,8 +120,8 @@ void ksmbd_conn_enqueue_request(struct ksmbd_work *work) 
	if (conn->ops->get_cmd_val(work) != SMB2_CANCEL_HE)

		requests_queue = &conn->requests;



	if (requests_queue) {

	atomic_inc(&conn->req_running);

	if (requests_queue) {

		spin_lock(&conn->request_lock);

		list_add_tail(&work->request_entry, requests_queue);

		spin_unlock(&conn->request_lock);
@@ -132,11 +132,12 @@ void ksmbd_conn_try_dequeue_request(struct ksmbd_work *work) 
{

	struct ksmbd_conn *conn = work->conn;



	atomic_dec(&conn->req_running);



	if (list_empty(&work->request_entry) &&

	    list_empty(&work->async_request_entry))

		return;



	atomic_dec(&conn->req_running);

	spin_lock(&conn->request_lock);

	list_del_init(&work->request_entry);

	spin_unlock(&conn->request_lock);