NFS: nfs_invalidate_folio() must observe the offset and size arguments

[ Upstream commit b7b8574225e9d2b5f1fb5483886ab797892f43b5 ]

If we're truncating part of the folio, then we need to write out the
data on the part that is not covered by the cancellation.

Fixes: d47992f86b30 ("mm: change invalidatepage prototype to accept length")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 033feeab8c346ee89ad001487d543d78a3fe7b3d..a16a619fb8c33bb1e009eec4c1a1ac6443dd014c 100644 (file)
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -437,10 +437,11 @@ static void nfs_invalidate_folio(struct folio *folio, size_t offset,
        dfprintk(PAGECACHE, "NFS: invalidate_folio(%lu, %zu, %zu)\n",
                 folio->index, offset, length);
 
-       if (offset != 0 || length < folio_size(folio))
-               return;
        /* Cancel any unstarted writes on this page */
-       nfs_wb_folio_cancel(inode, folio);
+       if (offset != 0 || length < folio_size(folio))
+               nfs_wb_folio(inode, folio);
+       else
+               nfs_wb_folio_cancel(inode, folio);
        folio_wait_private_2(folio); /* [DEPRECATED] */
        trace_nfs_invalidate_folio(inode, folio_pos(folio) + offset, length);
 }

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 2b6b3542405c3013b0c708d0f786bdc48b6a9b5f..fd86546fafd3f85a49600d35786a345dae08d973 100644 (file)
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -2058,6 +2058,7 @@ int nfs_wb_folio_cancel(struct inode *inode, struct folio *folio)
                 * release it */
                nfs_inode_remove_request(req);
                nfs_unlock_and_release_request(req);
+               folio_cancel_dirty(folio);
        }
 
        return ret;