Streamline SendReceiveBlockingLock: Use "goto out:" in an error condition

Streamline SendReceiveBlockingLock: Use "goto out:" in an error condition

Signed-off-by: Volker Lendecke <vl@samba.org>
Signed-off-by: Steve French <sfrench@us.ibm.com>

diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index ca015e60002ada7e3a3edb95eacdf029cf67864c..0fe2527ce459e9a6d2ab401e6ef6ad71c6348242 100644 (file)
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -1062,44 +1062,48 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifsTconInfo *tcon,
                cERROR(1, ("Frame too large received.  Length: %d  Xid: %d",
                        receive_len, xid));
                rc = -EIO;
-       } else {                /* rcvd frame is ok */
-
-               if (midQ->resp_buf && out_buf
-                   && (midQ->midState == MID_RESPONSE_RECEIVED)) {
-                       out_buf->smb_buf_length = receive_len;
-                       memcpy((char *)out_buf + 4,
-                              (char *)midQ->resp_buf + 4,
-                              receive_len);
-
-                       dump_smb(out_buf, 92);
-                       /* convert the length into a more usable form */
-                       if ((receive_len > 24) &&
-                          (ses->server->secMode & (SECMODE_SIGN_REQUIRED |
-                                       SECMODE_SIGN_ENABLED))) {
-                               rc = cifs_verify_signature(out_buf,
-                                               &ses->server->mac_signing_key,
-                                               midQ->sequence_number+1);
-                               if (rc) {
-                                       cERROR(1, ("Unexpected SMB signature"));
-                                       /* BB FIXME add code to kill session */
-                               }
-                       }
+               goto out;
+       }
 
-                       *pbytes_returned = out_buf->smb_buf_length;
+       /* rcvd frame is ok */
 
-                       /* BB special case reconnect tid and uid here? */
-                       rc = map_smb_to_linux_error(out_buf, 0 /* no log */ );
+       if (midQ->resp_buf && out_buf
+           && (midQ->midState == MID_RESPONSE_RECEIVED)) {
+               out_buf->smb_buf_length = receive_len;
+               memcpy((char *)out_buf + 4,
+                      (char *)midQ->resp_buf + 4,
+                      receive_len);
 
-                       /* convert ByteCount if necessary */
-                       if (receive_len >= sizeof(struct smb_hdr) - 4
-                           /* do not count RFC1001 header */  +
-                           (2 * out_buf->WordCount) + 2 /* bcc */ )
-                               BCC(out_buf) = le16_to_cpu(BCC_LE(out_buf));
-               } else {
-                       rc = -EIO;
-                       cERROR(1, ("Bad MID state?"));
+               dump_smb(out_buf, 92);
+               /* convert the length into a more usable form */
+               if ((receive_len > 24) &&
+                   (ses->server->secMode & (SECMODE_SIGN_REQUIRED |
+                                            SECMODE_SIGN_ENABLED))) {
+                       rc = cifs_verify_signature(out_buf,
+                                                  &ses->server->mac_signing_key,
+                                                  midQ->sequence_number+1);
+                       if (rc) {
+                               cERROR(1, ("Unexpected SMB signature"));
+                               /* BB FIXME add code to kill session */
+                       }
                }
+
+               *pbytes_returned = out_buf->smb_buf_length;
+
+               /* BB special case reconnect tid and uid here? */
+               rc = map_smb_to_linux_error(out_buf, 0 /* no log */ );
+
+               /* convert ByteCount if necessary */
+               if (receive_len >= sizeof(struct smb_hdr) - 4
+                   /* do not count RFC1001 header */  +
+                   (2 * out_buf->WordCount) + 2 /* bcc */ )
+                       BCC(out_buf) = le16_to_cpu(BCC_LE(out_buf));
+       } else {
+               rc = -EIO;
+               cERROR(1, ("Bad MID state?"));
        }
+
+out:
        DeleteMidQEntry(midQ);
        if (rstart && rc == -EACCES)
                return -ERESTARTSYS;