Commit 8e4f2e8a authored by Volker Lendecke's avatar Volker Lendecke Committed by Steve French
Browse files

Slightly streamline SendReceive[2] 



Slightly streamline SendReceive[2]

Remove an else branch by naming the error condition what it is

Signed-off-by: default avatarVolker Lendecke <vl@samba.org>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 829049cb

fs/cifs/transport.c

+9 −8
Original line number Diff line number Diff line
@@ -583,10 +583,8 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses, 
	wait_for_response(ses, midQ, timeout, 10 * HZ);



	spin_lock(&GlobalMid_Lock);

	if (midQ->resp_buf) {

		spin_unlock(&GlobalMid_Lock);

		receive_len = midQ->resp_buf->smb_buf_length;

	} else {



	if (midQ->resp_buf == NULL) {

		cERROR(1, ("No response to cmd %d mid %d",

			midQ->command, midQ->mid));

		if (midQ->midState == MID_REQUEST_SUBMITTED) {
@@ -614,6 +612,9 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses, 
		return rc;

	}



	spin_unlock(&GlobalMid_Lock);

	receive_len = midQ->resp_buf->smb_buf_length;



	if (receive_len > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE) {

		cERROR(1, ("Frame too large received.  Length: %d  Xid: %d",

			receive_len, xid));
@@ -773,10 +774,7 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses, 
	wait_for_response(ses, midQ, timeout, 10 * HZ);



	spin_lock(&GlobalMid_Lock);

	if (midQ->resp_buf) {

		spin_unlock(&GlobalMid_Lock);

		receive_len = midQ->resp_buf->smb_buf_length;

	} else {

	if (midQ->resp_buf == NULL) {

		cERROR(1, ("No response for cmd %d mid %d",

			  midQ->command, midQ->mid));

		if (midQ->midState == MID_REQUEST_SUBMITTED) {
@@ -804,6 +802,9 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses, 
		return rc;

	}



	spin_unlock(&GlobalMid_Lock);

	receive_len = midQ->resp_buf->smb_buf_length;



	if (receive_len > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE) {

		cERROR(1, ("Frame too large received.  Length: %d  Xid: %d",

			receive_len, xid));