CIFS: Indicate reconnect with ECONNABORTED error code

that let us not mix it with EAGAIN.

Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 20d75b8ddb26a815c8c21fcea9639a5d48e909a8..b0427f6ea97135a3fe056688023ed842a17efb92 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -557,7 +557,7 @@ cifs_readv_from_socket(struct TCP_Server_Info *server, struct kvec *iov_orig,
                try_to_freeze();
 
                if (server_unresponsive(server)) {
-                       total_read = -EAGAIN;
+                       total_read = -ECONNABORTED;
                        break;
                }
 
@@ -571,7 +571,7 @@ cifs_readv_from_socket(struct TCP_Server_Info *server, struct kvec *iov_orig,
                        break;
                } else if (server->tcpStatus == CifsNeedReconnect) {
                        cifs_reconnect(server);
-                       total_read = -EAGAIN;
+                       total_read = -ECONNABORTED;
                        break;
                } else if (length == -ERESTARTSYS ||
                           length == -EAGAIN ||
@@ -588,7 +588,7 @@ cifs_readv_from_socket(struct TCP_Server_Info *server, struct kvec *iov_orig,
                        cifs_dbg(FYI, "Received no data or error: expecting %d\n"
                                 "got %d", to_read, length);
                        cifs_reconnect(server);
-                       total_read = -EAGAIN;
+                       total_read = -ECONNABORTED;
                        break;
                }
        }
@@ -786,7 +786,7 @@ standard_receive3(struct TCP_Server_Info *server, struct mid_q_entry *mid)
                cifs_dbg(VFS, "SMB response too long (%u bytes)\n", pdu_length);
                cifs_reconnect(server);
                wake_up(&server->response_q);
-               return -EAGAIN;
+               return -ECONNABORTED;
        }
 
        /* switch to large buffer if too big for a small one */

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index ebdeb56f8d30a905f19cae556ef7620f70daaef6..9582ded2332e763d52c86e7d268b1fbd726a6ce1 100644 (file)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -2909,7 +2909,7 @@ cifs_uncached_read_into_pages(struct TCP_Server_Info *server,
                total_read += result;
        }
 
-       return total_read > 0 && result != -EAGAIN ? total_read : result;
+       return total_read > 0 && result != -ECONNABORTED ? total_read : result;
 }
 
 static int
@@ -3359,7 +3359,7 @@ cifs_readpages_read_into_pages(struct TCP_Server_Info *server,
                total_read += result;
        }
 
-       return total_read > 0 && result != -EAGAIN ? total_read : result;
+       return total_read > 0 && result != -ECONNABORTED ? total_read : result;
 }
 
 static int