CIFS: Implement cifs_file_strict_mmap (try #2)
Subsystems (2)
PATCH 3/6 CIFS: Implement cifs_file_strict_mmap (try #2)
Invalidate inode mapping if we don't have at least Level II oplock.
Signed-off-by Pavel Shilovsky <[email protected]>
--- fs/cifs/cifsfs.c | 4 ++-- fs/cifs/cifsfs.h | 1 + fs/cifs/file.c | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-)
fs/cifs/cifsfs.c +2 -2
@@ -720,7 +720,7 @@ const struct file_operations cifs_file_strict_ops = { .lock = cifs_lock, .fsync = cifs_strict_fsync, .flush = cifs_flush, - .mmap = cifs_file_mmap, + .mmap = cifs_file_strict_mmap, .splice_read = generic_file_splice_read, .llseek = cifs_llseek,#ifdef CONFIG_CIFS_POSIX
@@ -775,7 +775,7 @@ const struct file_operations cifs_file_strict_nobrl_ops = { .release = cifs_close, .fsync = cifs_strict_fsync, .flush = cifs_flush, - .mmap = cifs_file_mmap, + .mmap = cifs_file_strict_mmap, .splice_read = generic_file_splice_read, .llseek = cifs_llseek,#ifdef CONFIG_CIFS_POSIX
fs/cifs/cifsfs.h +1 -0
@@ -89,6 +89,7 @@ extern int cifs_fsync(struct file *, int);extern int cifs_strict_fsync (struct file *,int );extern int cifs_flush (struct file *,fl_owner_t id);extern int cifs_file_mmap (struct file * ,struct vm_area_struct *); +extern int cifs_file_strict_mmap (struct file * ,struct vm_area_struct *);extern const struct file_operations cifs_dir_ops;extern int cifs_dir_open (struct inode *inode,struct file *file);extern int cifs_readdir (struct file *file,void *direntry,filldir_t filldir);
fs/cifs/file.c +15 -0
@@ -1827,6 +1827,21 @@ static ssize_t cifs_read(struct file *file, char *read_data, size_t read_size,return total_read; } +int cifs_file_strict_mmap (struct file *file,struct vm_area_struct *vma) +{ +int rc, xid; +struct inode *inode = file->f_path.dentry->d_inode; + + xid =GetXid (); + +if (!CIFS_I (inode)->clientCanCacheRead) +cifs_invalidate_mapping (inode); + + rc =generic_file_mmap (file, vma); +FreeXid (xid); +return rc; +} +int cifs_file_mmap (struct file *file,struct vm_area_struct *vma) {int rc, xid;
Signature · 1 line
1.7.3.2
A message that is not in the archive (sent off-list or not yet received): 1292486012-9641-1-git-send-email-piastryyy-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
PATCH 4/6 CIFS: Implement cifs_strict_read (try #2)
Read from the cache if we have at least Level II oplock - otherwise read from the server. Add cifs_user_readv to let the client read into several buffers.
Signed-off-by Pavel Shilovsky <[email protected]>
--- fs/cifs/cifsfs.c | 38 ++++++++++++++++++- fs/cifs/cifsfs.h | 4 +- fs/cifs/file.c | 108 +++++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 117 insertions(+), 33 deletions(-)
fs/cifs/cifsfs.c +36 -2
@@ -572,6 +572,40 @@ cifs_do_mount(struct file_system_type *fs_type,return dget (sb->s_root); } +static ssize_t cifs_strict_read (struct kiocb *iocb,const struct iovec *iov, +unsigned long nr_segs,loff_t pos) +{ +struct inode *inode; +struct cifs_sb_info *cifs_sb; +ssize_t read =0 ; + +if (!nr_segs) +return read; + + inode = iocb->ki_filp->f_path.dentry->d_inode; + cifs_sb =CIFS_SB (iocb->ki_filp->f_path.dentry->d_sb); + +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. +*/ + + read =cifs_user_readv (iocb->ki_filp, iov, nr_segs, &pos); +if (read <0 ) +return read; + + iocb->ki_pos = pos; + +return read; +} +static ssize_t cifs_file_aio_write (struct kiocb *iocb,const struct iovec *iov,unsigned long nr_segs,loff_t pos) {
@@ -713,7 +747,7 @@ const struct file_operations cifs_file_ops = {const struct file_operations cifs_file_strict_ops = { .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, + .aio_read = cifs_strict_read, .aio_write = cifs_file_aio_write, .open = cifs_open, .release = cifs_close,
@@ -769,7 +803,7 @@ const struct file_operations cifs_file_nobrl_ops = {const struct file_operations cifs_file_strict_nobrl_ops = { .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, + .aio_read = cifs_strict_read, .aio_write = cifs_file_aio_write, .open = cifs_open, .release = cifs_close,
fs/cifs/cifsfs.h +3 -1
@@ -81,7 +81,9 @@ extern int cifs_open(struct inode *inode, struct file *file);extern int cifs_close (struct inode *inode,struct file *file);extern int cifs_closedir (struct inode *inode,struct file *file);extern ssize_t cifs_user_read (struct file *file,char __user *read_data, -size_t read_size,loff_t *poffset); +size_t read_size,loff_t *poffset); +extern ssize_t cifs_user_readv (struct file *file,const struct iovec *iov, +unsigned long nr_segs,loff_t *poffset);extern ssize_t cifs_user_write (struct file *file,const char __user *write_data,size_t write_size,loff_t *poffset);extern int cifs_lock (struct file *,int ,struct file_lock *);
fs/cifs/file.c +78 -30
156 lines not on this page · raw message
Signature · 1 line
1.7.3.2