diff options
| author | Pavel Shilovsky <pshilovsky@samba.org> | 2012-09-19 01:20:28 +0200 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2012-09-25 04:46:27 +0200 |
| commit | fc9c59662e0cd37577556d0de865268baeb9b293 (patch) | |
| tree | 3b89e75e749bd1d06a7cbfd3cf4b074aa67eb7ec /fs/cifs | |
| parent | CIFS: Add SMB2 r/wsize negotiating (diff) | |
| download | linux-fc9c59662e0cd37577556d0de865268baeb9b293.tar.xz linux-fc9c59662e0cd37577556d0de865268baeb9b293.zip | |
CIFS: Move async read to ops struct
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/cifsglob.h | 3 | ||||
| -rw-r--r-- | fs/cifs/file.c | 8 | ||||
| -rw-r--r-- | fs/cifs/smb1ops.c | 1 | ||||
| -rw-r--r-- | fs/cifs/smb2maperror.c | 3 |
4 files changed, 13 insertions, 2 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index e5cb1941e251..fcf81c05635f 100644 --- a/fs/cifs/cifsglob.h +++ b/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/fs/cifs/file.c b/fs/cifs/file.c index aa1dccf0df9e..ec7c2e6bcbdf 100644 --- a/fs/cifs/file.c +++ b/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/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c index 7e8a2bdd69c8..e2dbd22cb136 100644 --- a/fs/cifs/smb1ops.c +++ b/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/fs/cifs/smb2maperror.c b/fs/cifs/smb2maperror.c index be41478acc05..eaf5466d4041 100644 --- a/fs/cifs/smb2maperror.c +++ b/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); |