cifs: Change SMB2_open to return an iov for the error parameter

[tomoyo/tomoyo-test1.git] / fs / cifs / cifssmb.c

diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 59c09a5..890b3a4 100644 (file)
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -206,8 +206,10 @@ cifs_reconnect_tcon(struct cifs_tcon *tcon, int smb_command)
        mutex_unlock(&ses->session_mutex);
        cifs_dbg(FYI, "reconnect tcon rc = %d\n", rc);
 
-       if (rc)
+       if (rc) {
+               printk_once(KERN_WARNING "reconnect tcon failed rc = %d\n", rc);
                goto out;
+       }
 
        atomic_inc(&tconInfoReconnectCount);
 
@@ -1454,7 +1456,7 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid)
        unsigned int data_offset, data_len;
        struct cifs_readdata *rdata = mid->callback_data;
        char *buf = server->smallbuf;
-       unsigned int buflen = get_rfc1002_length(buf) +
+       unsigned int buflen = server->pdu_size +
                server->vals->header_preamble_size;
        bool use_rdma_mr = false;