Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

CIFS: Move async read to ops struct

Browse Source 
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>
This commit is contained in:
Pavel Shilovsky 2012-09-18 16:20:28 -07:00 committed by Steve French
parent 3a3bab509f
commit fc9c59662e
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/cifs/cifsglob.h
View File

@ -172,6 +172,7 @@ struct dfs_info3_param;
struct cifs_fattr; struct cifs_fattr;
struct smb_vol; struct smb_vol;
struct cifs_fid; struct cifs_fid;
struct cifs_readdata;
struct smb_version_operations { struct smb_version_operations {
int (*send_cancel)(struct TCP_Server_Info *, void *, 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 *); int (*close)(const unsigned int, struct cifs_tcon *, struct cifs_fid *);
/* send a flush request to the server */ /* send a flush request to the server */
int (*flush)(const unsigned int, struct cifs_tcon *, struct cifs_fid *); 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 { struct smb_version_values {

8
fs/cifs/file.c
View File

@ -2488,6 +2488,9 @@ static int
cifs_retry_async_readv(struct cifs_readdata *rdata) cifs_retry_async_readv(struct cifs_readdata *rdata)
{ {
int rc; int rc;
struct TCP_Server_Info *server;
server = tlink_tcon(rdata->cfile->tlink)->ses->server;
do { do {
if (rdata->cfile->invalidHandle) { if (rdata->cfile->invalidHandle) {
@ -2495,7 +2498,7 @@ cifs_retry_async_readv(struct cifs_readdata *rdata)
if (rc != 0) if (rc != 0)
continue; continue;
} }
rc = cifs_async_readv(rdata); rc = server->ops->async_readv(rdata);
} while (rc == -EAGAIN); } while (rc == -EAGAIN);
return rc; return rc;
@ -2647,6 +2650,9 @@ cifs_iovec_read(struct file *file, const struct iovec *iov,
open_file = file->private_data; open_file = file->private_data;
tcon = tlink_tcon(open_file->tlink); tcon = tlink_tcon(open_file->tlink);
if (!tcon->ses->server->ops->async_readv)
return -ENOSYS;
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD) if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD)
pid = open_file->pid; pid = open_file->pid;
else else

1
fs/cifs/smb1ops.c
View File

@ -785,6 +785,7 @@ struct smb_version_operations smb1_operations = {
.set_fid = cifs_set_fid, .set_fid = cifs_set_fid,
.close = cifs_close_file, .close = cifs_close_file,
.flush = cifs_flush_file, .flush = cifs_flush_file,
.async_readv = cifs_async_readv,
}; };
struct smb_version_values smb1_values = { struct smb_version_values smb1_values = {

3
fs/cifs/smb2maperror.c
View File

@ -2455,7 +2455,8 @@ map_smb2_to_linux_error(char *buf, bool log_err)
return 0; return 0;
/* mask facility */ /* 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); smb2_print_status(smb2err);
else if (cifsFYI & CIFS_RC) else if (cifsFYI & CIFS_RC)
smb2_print_status(smb2err); smb2_print_status(smb2err);