From: Pavel Shilovsky <piastryyy-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH 3/5] CIFS: New read logic
Date: Tue, 2 Nov 2010 12:01:54 +0300 [thread overview]
Message-ID: <AANLkTin6dgy-0SJnaL-aXW1FiaOK-cxKbc+qSe3gW=KR@mail.gmail.com> (raw)
Add cifs_file_aio_read to let the client works with strict cache mode.
Signed-off-by: Pavel Shilovsky <piastryyy-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
fs/cifs/cifsfs.c | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 75c4eaa..1b44a92 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -569,6 +569,36 @@ cifs_do_mount(struct file_system_type *fs_type,
return dget(sb->s_root);
}
+static ssize_t cifs_file_aio_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;
+
+ inode = iocb->ki_filp->f_path.dentry->d_inode;
+ cifs_sb = CIFS_SB(iocb->ki_filp->f_path.dentry->d_sb);
+
+ if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO) == 0) {
+ int retval;
+
+ retval = cifs_revalidate_file(iocb->ki_filp);
+ if (retval < 0)
+ return (loff_t)retval;
+
+ return generic_file_aio_read(iocb, iov, nr_segs, pos);
+ }
+
+ if (!CIFS_I(inode)->clientCanCacheRead) {
+ read = cifs_user_read(iocb->ki_filp, iov->iov_base,
+ iov->iov_len, &pos);
+ iocb->ki_pos = pos;
+ } else
+ read = generic_file_aio_read(iocb, iov, nr_segs, pos);
+
+ return read;
+}
+
static ssize_t cifs_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
unsigned long nr_segs, loff_t pos)
{
@@ -691,7 +721,7 @@ const struct inode_operations cifs_symlink_inode_ops = {
const struct file_operations cifs_file_ops = {
.read = do_sync_read,
.write = do_sync_write,
- .aio_read = generic_file_aio_read,
+ .aio_read = cifs_file_aio_read,
.aio_write = cifs_file_aio_write,
.open = cifs_open,
.release = cifs_close,
@@ -728,7 +758,7 @@ const struct file_operations cifs_file_direct_ops = {
const struct file_operations cifs_file_nobrl_ops = {
.read = do_sync_read,
.write = do_sync_write,
- .aio_read = generic_file_aio_read,
+ .aio_read = cifs_file_aio_read,
.aio_write = cifs_file_aio_write,
.open = cifs_open,
.release = cifs_close,
--
1.7.2.3
next reply other threads:[~2010-11-02 9:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-02 9:01 Pavel Shilovsky [this message]
[not found] ` <AANLkTin6dgy-0SJnaL-aXW1FiaOK-cxKbc+qSe3gW=KR-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2010-11-02 15:36 ` [PATCH 3/5] CIFS: New read logic Jeff Layton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='AANLkTin6dgy-0SJnaL-aXW1FiaOK-cxKbc+qSe3gW=KR@mail.gmail.com' \
--to=piastryyy-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.