From: Pavel Shilovsky <piastryyy@xxxxxxxxx>
Signed-off-by: Pavel Shilovsky <piastryyy@xxxxxxxxx>
---
fs/cifs/smb2file.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
fs/cifs/smb2proto.h | 4 ++++
2 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/fs/cifs/smb2file.c b/fs/cifs/smb2file.c
index acbfebd..d493f78 100644
--- a/fs/cifs/smb2file.c
+++ b/fs/cifs/smb2file.c
@@ -56,8 +56,8 @@ const struct file_operations smb2_file_ops = {
const struct file_operations smb2_file_strict_ops = {
.read = do_sync_read,
.write = do_sync_write,
- .aio_read = cifs_strict_readv,
- .aio_write = cifs_strict_writev,
+ .aio_read = smb2_strict_readv,
+ .aio_write = smb2_strict_writev,
.open = smb2_open,
.release = cifs_close,
.lock = cifs_lock,
@@ -113,8 +113,8 @@ const struct file_operations smb2_file_nobrl_ops = {
const struct file_operations smb2_file_strict_nobrl_ops = {
.read = do_sync_read,
.write = do_sync_write,
- .aio_read = cifs_strict_readv,
- .aio_write = cifs_strict_writev,
+ .aio_read = smb2_strict_readv,
+ .aio_write = smb2_strict_writev,
.open = smb2_open,
.release = cifs_close,
.fsync = smb2_strict_fsync,
@@ -404,6 +404,26 @@ ssize_t smb2_user_writev(struct kiocb *iocb, const struct iovec *iov,
return written;
}
+ssize_t smb2_strict_writev(struct kiocb *iocb, const struct iovec *iov,
+ unsigned long nr_segs, loff_t pos)
+{
+ struct inode *inode;
+
+ inode = iocb->ki_filp->f_path.dentry->d_inode;
+
+ if (CIFS_I(inode)->clientCanCacheAll)
+ return generic_file_aio_write(iocb, iov, nr_segs, pos);
+
+ /*
+ * In strict cache mode we need to write the data to the server exactly
+ * from the pos to pos+len-1 rather than flush all affected pages
+ * because it may cause a error with mandatory locks on these pages but
+ * not on the region from pos to ppos+len-1.
+ */
+
+ return smb2_user_writev(iocb, iov, nr_segs, pos);
+}
+
static int
smb2_iread_cb(int xid, struct cifsFileInfo *cfile, struct cifs_io_parms *parms,
unsigned int *bytes_read, char **all_data, char **data_offset,
@@ -443,6 +463,28 @@ ssize_t smb2_user_readv(struct kiocb *iocb, const struct iovec *iov,
return read;
}
+ssize_t smb2_strict_readv(struct kiocb *iocb, const struct iovec *iov,
+ unsigned long nr_segs, loff_t pos)
+{
+ struct inode *inode;
+
+ inode = iocb->ki_filp->f_path.dentry->d_inode;
+
+ if (CIFS_I(inode)->clientCanCacheRead)
+ return generic_file_aio_read(iocb, iov, nr_segs, pos);
+
+ /*
+ * In strict cache mode we need to read from the server all the time
+ * if we don't have level II oplock because the server can delay mtime
+ * change - so we can't make a decision about inode invalidating.
+ * And we can also fail with pagereading if there are mandatory locks
+ * on pages affected by this read but not on the region from pos to
+ * pos+len-1.
+ */
+
+ return smb2_user_readv(iocb, iov, nr_segs, pos);
+}
+
int
smb2_read_cb(int xid, struct cifsFileInfo *cfile, struct cifs_io_parms *parms,
unsigned int *bytes_read, char **buf, int *buf_type,
diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h
index 58b4b64..4c47505 100644
--- a/fs/cifs/smb2proto.h
+++ b/fs/cifs/smb2proto.h
@@ -112,8 +112,12 @@ extern int smb2_reopen_file_cb(struct cifsFileInfo *cifs_file, int xid,
__u32 *oplock);
extern ssize_t smb2_user_writev(struct kiocb *iocb, const struct iovec *iov,
unsigned long nr_segs, loff_t pos);
+extern ssize_t smb2_strict_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 ssize_t smb2_strict_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,
--
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
