diff options
| author | Pavel Shilovsky <piastry@etersoft.ru> | 2011-03-16 01:55:32 +0300 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-05-19 18:10:50 +0400 |
| commit | 257fb1f15d72f89dad2d72fa467c189f2d7fdd71 (patch) | |
| tree | 75069bb2801c4e9642d00b702c0c2e742826de33 /fs | |
| parent | fd5707e1b44560d18b47d552c1871ea0bfc46688 (diff) | |
| download | linux-257fb1f15d72f89dad2d72fa467c189f2d7fdd71.tar.xz | |
CIFS: Use invalidate_inode_pages2 instead of invalidate_remote_inode (try #4)
Use invalidate_inode_pages2 that don't leave pages even if shrink_page_list()
has a temp ref on them. It prevents a data coherency problem when
cifs_invalidate_mapping didn't invalidate pages but the client thinks that a data
from the cache is uptodate according to an oplock level (exclusive or II).
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/inode.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 196ef6078029..fbe7d5858563 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -1691,12 +1691,18 @@ cifs_invalidate_mapping(struct inode *inode) cifs_i->invalid_mapping = false; - /* write back any cached data */ if (inode->i_mapping && inode->i_mapping->nrpages != 0) { + /* write back any cached data */ rc = filemap_write_and_wait(inode->i_mapping); mapping_set_error(inode->i_mapping, rc); + rc = invalidate_inode_pages2(inode->i_mapping); + if (rc) { + cERROR(1, "%s: could not invalidate inode %p", __func__, + inode); + cifs_i->invalid_mapping = true; + } } - invalidate_remote_inode(inode); + cifs_fscache_reset_inode_cookie(inode); } |