From: Pavel Shilovsky <piastryyy@xxxxxxxxx>
and temporarily disable writepages support.
Signed-off-by: Pavel Shilovsky <piastryyy@xxxxxxxxx>
---
fs/cifs/file.c | 35 +++++++++++++++++++++++++++++------
fs/cifs/smb2file.c | 16 ++++++++++++++--
fs/cifs/smb2proto.h | 4 ++++
3 files changed, 47 insertions(+), 8 deletions(-)
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index e7c66bb..e0a12fa 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1482,9 +1482,10 @@ cifs_update_eof(struct cifsInodeInfo *cifsi, loff_t offset,
cifsi->server_eof = end_of_write;
}
-static ssize_t cifs_write(struct cifsFileInfo *open_file, __u32 pid,
- const char *write_data, size_t write_size,
- loff_t *poffset)
+static ssize_t
+cifs_write_generic(struct cifsFileInfo *open_file, __u32 pid,
+ const char *write_data, size_t write_size, loff_t *poffset,
+ iwrite_callback_t *write_cb)
{
int rc = 0;
unsigned int bytes_written = 0;
@@ -1527,13 +1528,12 @@ static ssize_t cifs_write(struct cifsFileInfo *open_file, __u32 pid,
/* iov[0] is reserved for smb header */
iov[1].iov_base = (char *)write_data + total_written;
iov[1].iov_len = len;
- io_parms.netfid = open_file->netfid;
io_parms.pid = pid;
io_parms.tcon = pTcon;
io_parms.offset = *poffset;
io_parms.length = len;
- rc = CIFSSMBWrite2(xid, &io_parms, &bytes_written, iov,
- 1, 0);
+ rc = write_cb(xid, open_file, &io_parms, &bytes_written,
+ iov, 1, write_size - total_written, 0);
}
if (rc || (bytes_written == 0)) {
if (total_written)
@@ -1561,6 +1561,29 @@ static ssize_t cifs_write(struct cifsFileInfo *open_file, __u32 pid,
return total_written;
}
+static int cifs_write_cb(int xid, struct cifsFileInfo *cfile,
+ struct cifs_io_parms *parms, unsigned int *written,
+ struct kvec *iov, unsigned long nr_segs,
+ unsigned int remaining_bytes, int timeout)
+{
+
+ parms->netfid = cfile->netfid;
+ return CIFSSMBWrite2(xid, parms, written, iov, nr_segs, timeout);
+}
+
+static ssize_t
+cifs_write(struct cifsFileInfo *cfile, __u32 pid, const char *write_data,
+ size_t write_size, loff_t *offset)
+{
+#ifdef CONFIG_CIFS_SMB2
+ if (tlink_tcon(cfile->tlink)->ses->server->is_smb2)
+ return cifs_write_generic(cfile, pid, write_data, write_size,
+ offset, smb2_write_cb);
+#endif
+ return cifs_write_generic(cfile, pid, write_data, write_size, offset,
+ cifs_write_cb);
+}
+
struct cifsFileInfo *find_readable_file(struct cifsInodeInfo *cifs_inode,
bool fsuid_only)
{
diff --git a/fs/cifs/smb2file.c b/fs/cifs/smb2file.c
index 9cdc0a1..6e55700 100644
--- a/fs/cifs/smb2file.c
+++ b/fs/cifs/smb2file.c
@@ -151,7 +151,7 @@ const struct address_space_operations smb2_addr_ops = {
.readpage = cifs_readpage,
/*.readpages = cifs_readpages,*/
.writepage = cifs_writepage,
- .writepages = cifs_writepages,
+ /*.writepages = cifs_writepages,*/
.write_begin = cifs_write_begin,
.write_end = cifs_write_end,
.set_page_dirty = __set_page_dirty_nobuffers,
@@ -168,7 +168,7 @@ const struct address_space_operations smb2_addr_ops = {
const struct address_space_operations smb2_addr_ops_smallbuf = {
.readpage = cifs_readpage,
.writepage = cifs_writepage,
- .writepages = cifs_writepages,
+ /*.writepages = cifs_writepages,*/
.write_begin = cifs_write_begin,
.write_end = cifs_write_end,
.set_page_dirty = __set_page_dirty_nobuffers,
@@ -447,3 +447,15 @@ smb2_read_cb(int xid, struct cifsFileInfo *cfile, struct cifs_io_parms *parms,
return SMB2_read(xid, parms, bytes_read, buf, buf_type,
remaining_bytes);
}
+
+int
+smb2_write_cb(int xid, struct cifsFileInfo *cfile, struct cifs_io_parms *parms,
+ unsigned int *written, struct kvec *iov, unsigned long nr_segs,
+ unsigned int remaining_bytes, int timeout)
+{
+
+ parms->persist_fid = cfile->persist_fid;
+ parms->volatile_fid = cfile->volatile_fid;
+ return SMB2_write(xid, parms, written, iov, nr_segs,
+ remaining_bytes, timeout);
+}
diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h
index 7ce37dd..d84e604 100644
--- a/fs/cifs/smb2proto.h
+++ b/fs/cifs/smb2proto.h
@@ -87,6 +87,10 @@ extern ssize_t smb2_user_writev(struct kiocb *iocb, const struct iovec *iov,
unsigned long nr_segs, loff_t pos);
extern ssize_t smb2_user_readv(struct kiocb *iocb, const struct iovec *iov,
unsigned long nr_segs, loff_t pos);
+extern int smb2_write_cb(int xid, struct cifsFileInfo *cfile,
+ struct cifs_io_parms *parms, unsigned int *written,
+ struct kvec *iov, unsigned long nr_segs,
+ unsigned int remaining_bytes, int timeout);
extern int smb2_read_cb(int xid, struct cifsFileInfo *cfile,
struct cifs_io_parms *parms, unsigned int *bytes_read,
char **buf, int *buf_type,
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
