All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pavel Shilovsky <pshilovsky-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>
To: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: Jeff Layton <jlayton-vpEMnDpepFuMZCB2o+C8xQ@public.gmane.org>
Subject: [PATCH v2 01/16] CIFS: Fix async reading on reconnects
Date: Fri, 27 Jun 2014 13:57:38 +0400	[thread overview]
Message-ID: <1403863073-19526-2-git-send-email-pshilovsky@samba.org> (raw)
In-Reply-To: <1403863073-19526-1-git-send-email-pshilovsky-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>

If we get into read_into_pages() from cifs_readv_receive() and then
loose a network, we issue cifs_reconnect that moves all mids to
a private list and issue their callbacks. The callback of the async
read request sets a mid to retry, frees it and wakes up a process
that waits on the rdata completion.

After the connection is established we return from read_into_pages()
with a short read, use the mid that was freed before and try to read
the remaining data from the a newly created socket. Both actions are
not what we want to do. In reconnect cases (-EAGAIN) we should not
mask off the error with a short read but should return the error
code instead.

Cc: Jeff Layton <jlayton-vpEMnDpepFuMZCB2o+C8xQ@public.gmane.org>
Signed-off-by: Pavel Shilovsky <pshilovsky-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>
---
 fs/cifs/file.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index e90a1e9..6b6df30 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -2823,7 +2823,7 @@ cifs_uncached_read_into_pages(struct TCP_Server_Info *server,
 		total_read += result;
 	}
 
-	return total_read > 0 ? total_read : result;
+	return total_read > 0 && result != -EAGAIN ? total_read : result;
 }
 
 ssize_t cifs_user_readv(struct kiocb *iocb, struct iov_iter *to)
@@ -3231,7 +3231,7 @@ cifs_readpages_read_into_pages(struct TCP_Server_Info *server,
 		total_read += result;
 	}
 
-	return total_read > 0 ? total_read : result;
+	return total_read > 0 && result != -EAGAIN ? total_read : result;
 }
 
 static int cifs_readpages(struct file *file, struct address_space *mapping,
-- 
1.8.1.2

  parent reply	other threads:[~2014-06-27  9:57 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-27  9:57 [PATCH v2 00/16] SMB 2.1/3 multicredit requests for reading/writing Pavel Shilovsky
     [not found] ` <1403863073-19526-1-git-send-email-pshilovsky-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>
2014-06-27  9:57   ` Pavel Shilovsky [this message]
     [not found]     ` <1403863073-19526-2-git-send-email-pshilovsky-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>
2014-06-27 10:52       ` [PATCH v2 01/16] CIFS: Fix async reading on reconnects Jeff Layton
     [not found]         ` <CAH2r5mvWfmgZb=7oGqbqbRDKv4xPP3RszHXpe-rxGv5FbGBerw@mail.gmail.com>
     [not found]           ` <CAH2r5mvWfmgZb=7oGqbqbRDKv4xPP3RszHXpe-rxGv5FbGBerw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-06-27 14:14             ` Fwd: " Steve French
     [not found]         ` <20140627065222.434cd5ea-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org>
2014-06-27 16:06           ` Pavel Shilovsky
     [not found]             ` <CAKywueSpPjEpyQYLvrSixf4tasxd5v4a51EBKhBboaTXcs5O1A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-07-03 10:45               ` Jeff Layton
     [not found]                 ` <20140703064549.7f6913f3-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org>
2014-07-03 16:12                   ` Pavel Shilovsky
2014-07-03 16:39                   ` Jeff Layton
     [not found]                     ` <20140703123930.5feb046f-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org>
2014-07-21 15:41                       ` Pavel Shilovsky
2014-06-27  9:57   ` [PATCH v2 02/16] CIFS: Separate page processing from writepages Pavel Shilovsky
     [not found]     ` <1403863073-19526-3-git-send-email-pshilovsky-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>
2014-07-09 12:59       ` Jeff Layton
2014-06-27  9:57   ` [PATCH v2 03/16] CIFS: Separate page sending " Pavel Shilovsky
     [not found]     ` <1403863073-19526-4-git-send-email-pshilovsky-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>
2014-07-09 13:08       ` Jeff Layton
     [not found]         ` <20140709090823.08bbd37b-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org>
2014-07-21 15:53           ` Pavel Shilovsky
2014-06-27  9:57   ` [PATCH v2 04/16] CIFS: Separate pages initialization " Pavel Shilovsky
     [not found]     ` <1403863073-19526-5-git-send-email-pshilovsky-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>
2014-07-19  6:24       ` Shirish Pargaonkar
2014-06-27  9:57   ` [PATCH v2 05/16] CIFS: Fix wsize usage in writepages Pavel Shilovsky
     [not found]     ` <1403863073-19526-6-git-send-email-pshilovsky-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>
2014-07-20 15:17       ` Shirish Pargaonkar
     [not found]         ` <CADT32e+ce727VwQD6WmhY_SWG_Xm+2JxGuC2GnPZG==nv9FgxQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-07-20 17:41           ` Pavel Shilovsky
     [not found]             ` <CAKywueRP6y7gdyXCYVBCXQU3_65=rU7+cP-UdgBrO5cwx+_nCA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-07-20 18:13               ` Shirish Pargaonkar
     [not found]                 ` <CADT32eK15DRUnrogmFFv2TicqhOhcNA0Y62dUeM+41YtjrZwFg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-07-21  7:03                   ` Pavel Shilovsky
2014-06-27  9:57   ` [PATCH v2 06/16] CIFS: Fix cifs_writev_requeue when wsize changes Pavel Shilovsky
     [not found]     ` <1403863073-19526-7-git-send-email-pshilovsky-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>
2014-07-20 19:49       ` Shirish Pargaonkar
     [not found]         ` <CADT32e+kGf-b989EFr4c_-e9+_MCVMkDShkh_30an8YKLiD6Zw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-07-21  6:43           ` Pavel Shilovsky
2014-06-27  9:57   ` [PATCH v2 07/16] CIFS: Separate filling pages from iovec write Pavel Shilovsky
     [not found]     ` <1403863073-19526-8-git-send-email-pshilovsky-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>
2014-07-21  3:59       ` Shirish Pargaonkar
     [not found]         ` <CADT32e+RhpebBn-2k-GrNomJ_=uY8v12KmWHFbd+NozNSi1t9w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-07-21  6:48           ` Pavel Shilovsky
2014-06-27  9:57   ` [PATCH v2 08/16] CIFS: Separate writing " Pavel Shilovsky
     [not found]     ` <1403863073-19526-9-git-send-email-pshilovsky-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>
2014-07-21  5:05       ` Shirish Pargaonkar
     [not found]         ` <CADT32e+2Z_ryfg8JznJoFt9=4mSU1bVYmeR-+nguXUq1vQVMMg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-07-21  6:56           ` Pavel Shilovsky
2014-06-27  9:57   ` [PATCH v2 09/16] CIFS: Fix wsize usage in " Pavel Shilovsky
2014-06-27  9:57   ` [PATCH v2 10/16] CIFS: Use multicredits for SMB 2.1/3 writes Pavel Shilovsky
2014-06-27  9:57   ` [PATCH v2 11/16] CIFS: Separate page search from readpages Pavel Shilovsky
2014-06-27  9:57   ` [PATCH v2 12/16] CIFS: Fix rsize usage in readpages Pavel Shilovsky
2014-06-27  9:57   ` [PATCH v2 13/16] CIFS: Separate page reading from user read Pavel Shilovsky
2014-06-27  9:57   ` [PATCH v2 14/16] CIFS: Fix rsize usage in " Pavel Shilovsky
2014-06-27  9:57   ` [PATCH v2 15/16] CIFS: Fix rsize usage for sync read Pavel Shilovsky
2014-06-27  9:57   ` [PATCH v2 16/16] CIFS: Use multicredits for SMB 2.1/3 reads Pavel Shilovsky

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1403863073-19526-2-git-send-email-pshilovsky@samba.org \
    --to=pshilovsky-eunubhrolfbytjvyw6ydsg@public.gmane.org \
    --cc=jlayton-vpEMnDpepFuMZCB2o+C8xQ@public.gmane.org \
    --cc=linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.