CIFS: Add writepage support for SMB2

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

diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index fb289d2abae7cd0e917d491ffe27e2d65098311c..f9c3dbee9010f4ceafddae9d2e468c7c0c906994 100644 (file)
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -404,6 +404,17 @@ smb2_sync_read(const unsigned int xid, struct cifsFileInfo *cfile,
        return SMB2_read(xid, parms, bytes_read, buf, buf_type);
 }
 
+static int
+smb2_sync_write(const unsigned int xid, struct cifsFileInfo *cfile,
+               struct cifs_io_parms *parms, unsigned int *written,
+               struct kvec *iov, unsigned long nr_segs)
+{
+
+       parms->persistent_fid = cfile->fid.persistent_fid;
+       parms->volatile_fid = cfile->fid.volatile_fid;
+       return SMB2_write(xid, parms, written, iov, nr_segs);
+}
+
 struct smb_version_operations smb21_operations = {
        .setup_request = smb2_setup_request,
        .setup_async_request = smb2_setup_async_request,
@@ -447,6 +458,7 @@ struct smb_version_operations smb21_operations = {
        .async_readv = smb2_async_readv,
        .async_writev = smb2_async_writev,
        .sync_read = smb2_sync_read,
+       .sync_write = smb2_sync_write,
 };
 
 struct smb_version_values smb21_values = {

diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 23c569386f32c7048e28848258e9682e55989027..00dc45a7881c1b0796a4e1fca4456a4f40ac9c09 100644 (file)
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -1501,3 +1501,64 @@ async_writev_out:
        kfree(iov);
        return rc;
 }
+
+/*
+ * SMB2_write function gets iov pointer to kvec array with n_vec as a length.
+ * The length field from io_parms must be at least 1 and indicates a number of
+ * elements with data to write that begins with position 1 in iov array. All
+ * data length is specified by count.
+ */
+int
+SMB2_write(const unsigned int xid, struct cifs_io_parms *io_parms,
+          unsigned int *nbytes, struct kvec *iov, int n_vec)
+{
+       int rc = 0;
+       struct smb2_write_req *req = NULL;
+       struct smb2_write_rsp *rsp = NULL;
+       int resp_buftype;
+       *nbytes = 0;
+
+       if (n_vec < 1)
+               return rc;
+
+       rc = small_smb2_init(SMB2_WRITE, io_parms->tcon, (void **) &req);
+       if (rc)
+               return rc;
+
+       if (io_parms->tcon->ses->server == NULL)
+               return -ECONNABORTED;
+
+       req->hdr.ProcessId = cpu_to_le32(io_parms->pid);
+
+       req->PersistentFileId = io_parms->persistent_fid;
+       req->VolatileFileId = io_parms->volatile_fid;
+       req->WriteChannelInfoOffset = 0;
+       req->WriteChannelInfoLength = 0;
+       req->Channel = 0;
+       req->Length = cpu_to_le32(io_parms->length);
+       req->Offset = cpu_to_le64(io_parms->offset);
+       /* 4 for rfc1002 length field */
+       req->DataOffset = cpu_to_le16(
+                               offsetof(struct smb2_write_req, Buffer) - 4);
+       req->RemainingBytes = 0;
+
+       iov[0].iov_base = (char *)req;
+       /* 4 for rfc1002 length field and 1 for Buffer */
+       iov[0].iov_len = get_rfc1002_length(req) + 4 - 1;
+
+       /* length of entire message including data to be written */
+       inc_rfc1001_len(req, io_parms->length - 1 /* Buffer */);
+
+       rc = SendReceive2(xid, io_parms->tcon->ses, iov, n_vec + 1,
+                         &resp_buftype, 0);
+
+       if (rc) {
+               cifs_stats_fail_inc(io_parms->tcon, SMB2_WRITE_HE);
+               cERROR(1, "Send error in write = %d", rc);
+       } else {
+               rsp = (struct smb2_write_rsp *)iov[0].iov_base;
+               *nbytes = le32_to_cpu(rsp->DataLength);
+               free_rsp_buf(resp_buftype, rsp);
+       }
+       return rc;
+}

diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h
index 97e62f3df410d5af9f95a3b0fac7de10c2a25e9a..192d0c7d91ebd1a66adbbe6e08d2f74f854fb6c9 100644 (file)
--- a/fs/cifs/smb2proto.h
+++ b/fs/cifs/smb2proto.h
@@ -101,6 +101,8 @@ extern int smb2_async_readv(struct cifs_readdata *rdata);
 extern int SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms,
                     unsigned int *nbytes, char **buf, int *buf_type);
 extern int smb2_async_writev(struct cifs_writedata *wdata);
+extern int SMB2_write(const unsigned int xid, struct cifs_io_parms *io_parms,
+                     unsigned int *nbytes, struct kvec *iov, int n_vec);
 extern int SMB2_echo(struct TCP_Server_Info *server);
 
 #endif                 /* _SMB2PROTO_H */