This is a note to let you know that I've just added the patch titled
CIFS: Fix async reading on reconnects
to the 3.16-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
cifs-fix-async-reading-on-reconnects.patch
and it can be found in the queue-3.16 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 038bc961c31b070269ecd07349a7ee2e839d4fec Mon Sep 17 00:00:00 2001
From: Pavel Shilovsky <pshilovsky@xxxxxxxxx>
Date: Fri, 27 Jun 2014 10:33:11 +0400
Subject: CIFS: Fix async reading on reconnects
From: Pavel Shilovsky <pshilovsky@xxxxxxxxx>
commit 038bc961c31b070269ecd07349a7ee2e839d4fec upstream.
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.
Acked-by: Jeff Layton <jlayton@xxxxxxxxx>
Signed-off-by: Pavel Shilovsky <pshilovsky@xxxxxxxxx>
Signed-off-by: Steve French <smfrench@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/cifs/file.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -2823,7 +2823,7 @@ cifs_uncached_read_into_pages(struct TCP
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 TC
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,
Patches currently in stable-queue which might be from pshilovsky@xxxxxxxxx are
queue-3.16/cifs-fix-wrong-restart-readdir-for-smb1.patch
queue-3.16/cifs-fix-directory-rename-error.patch
queue-3.16/cifs-fix-async-reading-on-reconnects.patch
queue-3.16/cifs-fix-wrong-directory-attributes-after-rename.patch
queue-3.16/cifs-fix-wrong-filename-length-for-smb2.patch
queue-3.16/cifs-fix-status_cannot_delete-error-mapping-for-smb2.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html