Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2db7c581 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: send an NT_CANCEL request when a process is signalled 



Use the new send_nt_cancel function to send an NT_CANCEL when the
process is delivered a fatal signal. This is a "best effort" enterprise
however, so don't bother to check the return code. There's nothing we
can reasonably do if it fails anyway.

Reviewed-by: default avatarPavel Shilovsky <piastryyy@gmail.com>
Reviewed-by: default avatarSuresh Jayaraman <sjayaraman@suse.de>
Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 1be912dd

fs/cifs/transport.c

+12 −3
Original line number Diff line number Diff line
@@ -570,20 +570,25 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses, 
#endif



	mutex_unlock(&ses->server->srv_mutex);

	cifs_small_buf_release(in_buf);



	if (rc < 0)

	if (rc < 0) {

		cifs_small_buf_release(in_buf);

		goto out;

	}



	if (long_op == CIFS_ASYNC_OP)

	if (long_op == CIFS_ASYNC_OP) {

		cifs_small_buf_release(in_buf);

		goto out;

	}



	rc = wait_for_response(ses->server, midQ);

	if (rc != 0) {

		send_nt_cancel(ses->server, in_buf, midQ);

		spin_lock(&GlobalMid_Lock);

		if (midQ->midState == MID_REQUEST_SUBMITTED) {

			midQ->callback = DeleteMidQEntry;

			spin_unlock(&GlobalMid_Lock);

			cifs_small_buf_release(in_buf);

			atomic_dec(&ses->server->inFlight);

			wake_up(&ses->server->request_q);

			return rc;
@@ -591,6 +596,8 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses, 
		spin_unlock(&GlobalMid_Lock);

	}



	cifs_small_buf_release(in_buf);



	rc = sync_mid_result(midQ, ses->server);

	if (rc != 0) {

		atomic_dec(&ses->server->inFlight);
@@ -734,6 +741,7 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses, 


	rc = wait_for_response(ses->server, midQ);

	if (rc != 0) {

		send_nt_cancel(ses->server, in_buf, midQ);

		spin_lock(&GlobalMid_Lock);

		if (midQ->midState == MID_REQUEST_SUBMITTED) {

			/* no longer considered to be "in-flight" */
@@ -943,6 +951,7 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifsTconInfo *tcon, 


		rc = wait_for_response(ses->server, midQ);

		if (rc) {

			send_nt_cancel(ses->server, in_buf, midQ);

			spin_lock(&GlobalMid_Lock);

			if (midQ->midState == MID_REQUEST_SUBMITTED) {

				/* no longer considered to be "in-flight" */