From: Pavel Shilovsky <piastryyy-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH 5/6] CIFS: Make cifs_file_map work with strict cache mode (try #3)
Date: Mon, 29 Nov 2010 16:36:44 +0300 [thread overview]
Message-ID: <1291037804-4000-4-git-send-email-piastryyy@gmail.com> (raw)
In-Reply-To: <1291037804-4000-1-git-send-email-piastryyy-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Invalidate inode if we don't have at least Level II oplock and strict
cache mode switched on.
Signed-off-by: Pavel Shilovsky <piastryyy-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
fs/cifs/file.c | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index d216879..e9f2fae 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1812,14 +1812,24 @@ static ssize_t cifs_read(struct file *file, char *read_data, size_t read_size,
int cifs_file_mmap(struct file *file, struct vm_area_struct *vma)
{
int rc, xid;
+ struct inode *inode = file->f_path.dentry->d_inode;
+ struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
xid = GetXid();
- rc = cifs_revalidate_file(file);
- if (rc) {
- cFYI(1, "Validation prior to mmap failed, error=%d", rc);
- FreeXid(xid);
- return rc;
+
+ if (!CIFS_I(inode)->clientCanCacheRead &&
+ (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO))
+ cifs_invalidate_mapping(inode);
+ else {
+ rc = cifs_revalidate_file(file);
+ if (rc) {
+ cFYI(1, "Validation prior to mmap failed, error=%d",
+ rc);
+ FreeXid(xid);
+ return rc;
+ }
}
+
rc = generic_file_mmap(file, vma);
FreeXid(xid);
return rc;
--
1.7.3.2
next prev parent reply other threads:[~2010-11-29 13:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-29 13:36 [PATCH 2/6] CIFS: Make read call work with strict cache mode (try #3) Pavel Shilovsky
[not found] ` <1291037804-4000-1-git-send-email-piastryyy-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2010-11-29 13:36 ` [PATCH 3/6] CIFS: Make write " Pavel Shilovsky
[not found] ` <1291037804-4000-2-git-send-email-piastryyy-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2010-11-30 7:56 ` Pavel Shilovsky
2010-11-29 13:36 ` [PATCH 4/6] CIFS: Make cifs_fsync " Pavel Shilovsky
[not found] ` <1291037804-4000-3-git-send-email-piastryyy-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2010-12-07 12:52 ` Jeff Layton
2010-11-29 13:36 ` Pavel Shilovsky [this message]
[not found] ` <1291037804-4000-4-git-send-email-piastryyy-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2010-12-07 12:56 ` [PATCH 5/6] CIFS: Make cifs_file_map " Jeff Layton
[not found] ` <20101207075635.6f9c1c5f-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org>
2010-12-08 20:53 ` Pavel Shilovsky
[not found] ` <AANLkTineJVVgK6aihGBLWJfEnEOuz67CcHncwBUpdvt0-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2010-12-08 20:59 ` Jeff Layton
2010-11-30 7:43 ` [PATCH 2/6] CIFS: Make read call " Pavel Shilovsky
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=1291037804-4000-4-git-send-email-piastryyy@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox