From a5882c707e6d4d3b7936c7a6ef088b1c9b49a2eb Mon Sep 17 00:00:00 2001
From: Pavel Shilovsky <pshilovsky@samba.org>
Date: Tue, 18 Sep 2012 16:20:28 -0700
Subject: [PATCH] --- yaml --- r: 326263 b: refs/heads/master c:
 fc9c59662e0cd37577556d0de865268baeb9b293 h: refs/heads/master i:   326261:
 0537c852ef74a0787282b87c62c64949f0cbeabe   326259:
 aa2f738b765729243457fd5134df3f67c1573667   326255:
 57b97febd9c3a1f19203c1bb39fbb8f9e127d08d v: v3

---
 [refs]                       | 2 +-
 trunk/fs/cifs/cifsglob.h     | 3 +++
 trunk/fs/cifs/file.c         | 8 +++++++-
 trunk/fs/cifs/smb1ops.c      | 1 +
 trunk/fs/cifs/smb2maperror.c | 3 ++-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index be7cc2b2d251..80067df11338 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a3bab509f3f0e7295caab24e9102ce303edb50b
+refs/heads/master: fc9c59662e0cd37577556d0de865268baeb9b293
diff --git a/trunk/fs/cifs/cifsglob.h b/trunk/fs/cifs/cifsglob.h
index e5cb1941e251..fcf81c05635f 100644
--- a/trunk/fs/cifs/cifsglob.h
+++ b/trunk/fs/cifs/cifsglob.h
@@ -172,6 +172,7 @@ struct dfs_info3_param;
 struct cifs_fattr;
 struct smb_vol;
 struct cifs_fid;
+struct cifs_readdata;
 
 struct smb_version_operations {
 	int (*send_cancel)(struct TCP_Server_Info *, void *,
@@ -280,6 +281,8 @@ struct smb_version_operations {
 	int (*close)(const unsigned int, struct cifs_tcon *, struct cifs_fid *);
 	/* send a flush request to the server */
 	int (*flush)(const unsigned int, struct cifs_tcon *, struct cifs_fid *);
+	/* async read from the server */
+	int (*async_readv)(struct cifs_readdata *);
 };
 
 struct smb_version_values {
diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c
index aa1dccf0df9e..ec7c2e6bcbdf 100644
--- a/trunk/fs/cifs/file.c
+++ b/trunk/fs/cifs/file.c
@@ -2488,6 +2488,9 @@ static int
 cifs_retry_async_readv(struct cifs_readdata *rdata)
 {
 	int rc;
+	struct TCP_Server_Info *server;
+
+	server = tlink_tcon(rdata->cfile->tlink)->ses->server;
 
 	do {
 		if (rdata->cfile->invalidHandle) {
@@ -2495,7 +2498,7 @@ cifs_retry_async_readv(struct cifs_readdata *rdata)
 			if (rc != 0)
 				continue;
 		}
-		rc = cifs_async_readv(rdata);
+		rc = server->ops->async_readv(rdata);
 	} while (rc == -EAGAIN);
 
 	return rc;
@@ -2647,6 +2650,9 @@ cifs_iovec_read(struct file *file, const struct iovec *iov,
 	open_file = file->private_data;
 	tcon = tlink_tcon(open_file->tlink);
 
+	if (!tcon->ses->server->ops->async_readv)
+		return -ENOSYS;
+
 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD)
 		pid = open_file->pid;
 	else
diff --git a/trunk/fs/cifs/smb1ops.c b/trunk/fs/cifs/smb1ops.c
index 7e8a2bdd69c8..e2dbd22cb136 100644
--- a/trunk/fs/cifs/smb1ops.c
+++ b/trunk/fs/cifs/smb1ops.c
@@ -785,6 +785,7 @@ struct smb_version_operations smb1_operations = {
 	.set_fid = cifs_set_fid,
 	.close = cifs_close_file,
 	.flush = cifs_flush_file,
+	.async_readv = cifs_async_readv,
 };
 
 struct smb_version_values smb1_values = {
diff --git a/trunk/fs/cifs/smb2maperror.c b/trunk/fs/cifs/smb2maperror.c
index be41478acc05..eaf5466d4041 100644
--- a/trunk/fs/cifs/smb2maperror.c
+++ b/trunk/fs/cifs/smb2maperror.c
@@ -2455,7 +2455,8 @@ map_smb2_to_linux_error(char *buf, bool log_err)
 		return 0;
 
 	/* mask facility */
-	if (log_err && (smb2err != (STATUS_MORE_PROCESSING_REQUIRED)))
+	if (log_err && (smb2err != STATUS_MORE_PROCESSING_REQUIRED) &&
+	    (smb2err != STATUS_END_OF_FILE))
 		smb2_print_status(smb2err);
 	else if (cifsFYI & CIFS_RC)
 		smb2_print_status(smb2err);