diff options
author | Ronnie Sahlberg <lsahlber@redhat.com> | 2022-09-20 14:32:02 +1000 |
---|---|---|
committer | Steve French <stfrench@microsoft.com> | 2022-09-25 17:31:28 -0500 |
commit | bb44c31cdcac107344dd2fcc3bd0504a53575c51 (patch) | |
tree | 0efbc938d53637432437bbe337da75024b1c1722 /fs | |
parent | 09a1f9a168ae1f69f701689429871793174417d2 (diff) | |
download | linux-bb44c31cdcac107344dd2fcc3bd0504a53575c51.tar.bz2 |
cifs: destage dirty pages before re-reading them for cache=none
This is the opposite case of kernel bugzilla 216301.
If we mmap a file using cache=none and then proceed to update the mmapped
area these updates are not reflected in a later pread() of that part of the
file.
To fix this we must first destage any dirty pages in the range before
we allow the pread() to proceed.
Cc: stable@vger.kernel.org
Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Reviewed-by: Enzo Matsumiya <ematsumiya@suse.de>
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/cifs/file.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 6f38b134a346..7d756721e1a6 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -4271,6 +4271,15 @@ static ssize_t __cifs_readv( len = ctx->len; } + if (direct) { + rc = filemap_write_and_wait_range(file->f_inode->i_mapping, + offset, offset + len - 1); + if (rc) { + kref_put(&ctx->refcount, cifs_aio_ctx_release); + return -EAGAIN; + } + } + /* grab a lock here due to read response handlers can access ctx */ mutex_lock(&ctx->aio_mutex); |