CIFS: Move async write to ops struct

Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>

4 files changed, 18 insertions, 3 deletions

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 93dd582bb8d1..aef167470654 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -173,6 +173,7 @@ struct cifs_fattr;
 struct smb_vol;
 struct cifs_fid;
 struct cifs_readdata;
+struct cifs_writedata;
 
 struct smb_version_operations {
         int (*send_cancel)(struct TCP_Server_Info *, void *,
@@ -283,6 +284,8 @@ struct smb_version_operations {
         int (*flush)(const unsigned int, struct cifs_tcon *, struct cifs_fid *);
         /* async read from the server */
         int (*async_readv)(struct cifs_readdata *);
+        /* async write to the server */
+        int (*async_writev)(struct cifs_writedata *);
 };
 
 struct smb_version_values {
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 8a07f218266f..2a9b27387708 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -1926,6 +1926,7 @@ cifs_writev_requeue(struct cifs_writedata *wdata)
 {
         int i, rc;
         struct inode *inode = wdata->cfile->dentry->d_inode;
+        struct TCP_Server_Info *server;
 
         for (i = 0; i < wdata->nr_pages; i++) {
                 lock_page(wdata->pages[i]);
@@ -1933,7 +1934,8 @@ cifs_writev_requeue(struct cifs_writedata *wdata)
         }
 
         do {
-                rc = cifs_async_writev(wdata);
+                server = tlink_tcon(wdata->cfile->tlink)->ses->server;
+                rc = server->ops->async_writev(wdata);
         } while (rc == -EAGAIN);
 
         for (i = 0; i < wdata->nr_pages; i++) {
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 29ac8ee46039..703c1648b068 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1754,6 +1754,7 @@ static int cifs_writepages(struct address_space *mapping,
         bool done = false, scanned = false, range_whole = false;
         pgoff_t end, index;
         struct cifs_writedata *wdata;
+        struct TCP_Server_Info *server;
         struct page *page;
         int rc = 0;
 
@@ -1904,7 +1905,8 @@ retry:
                                 break;
                         }
                         wdata->pid = wdata->cfile->pid;
-                        rc = cifs_async_writev(wdata);
+                        server = tlink_tcon(wdata->cfile->tlink)->ses->server;
+                        rc = server->ops->async_writev(wdata);
                 } while (wbc->sync_mode == WB_SYNC_ALL && rc == -EAGAIN);
 
                 for (i = 0; i < nr_pages; ++i)
@@ -2235,6 +2237,9 @@ static int
 cifs_uncached_retry_writev(struct cifs_writedata *wdata)
 {
         int rc;
+        struct TCP_Server_Info *server;
+
+        server = tlink_tcon(wdata->cfile->tlink)->ses->server;
 
         do {
                 if (wdata->cfile->invalidHandle) {
@@ -2242,7 +2247,7 @@ cifs_uncached_retry_writev(struct cifs_writedata *wdata)
                         if (rc != 0)
                                 continue;
                 }
-                rc = cifs_async_writev(wdata);
+                rc = server->ops->async_writev(wdata);
         } while (rc == -EAGAIN);
 
         return rc;
@@ -2277,6 +2282,10 @@ cifs_iovec_write(struct file *file, const struct iovec *iov,
         cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
         open_file = file->private_data;
         tcon = tlink_tcon(open_file->tlink);
+
+        if (!tcon->ses->server->ops->async_writev)
+                return -ENOSYS;
+
         offset = *poffset;
 
         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD)
diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
index e2dbd22cb136..50c3697af5aa 100644
--- a/fs/cifs/smb1ops.c
+++ b/fs/cifs/smb1ops.c
@@ -786,6 +786,7 @@ struct smb_version_operations smb1_operations = {
         .close = cifs_close_file,
         .flush = cifs_flush_file,
         .async_readv = cifs_async_readv,
+        .async_writev = cifs_async_writev,
 };
 
 struct smb_version_values smb1_values = {