diff options
| author |   Christian Brauner <brauner@kernel.org> | 2025-02-21 14:09:53 +0100 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2025-02-21 14:09:53 +0100 |
| commit | 4c7a22bda684f586910e2fadac70c65964a9a486 (patch) | |
| tree | 0e2eb6e7b889b67a8229b752a35e2e7c013cbb1b | |
| parent | fuse: don't truncate cached, mutated symlink (diff) | |
| parent | mm/truncate: don't skip dirty page in folio_unmap_invalidate() (diff) | |
| download | linux-rng-4c7a22bda684f586910e2fadac70c65964a9a486.tar.xz linux-rng-4c7a22bda684f586910e2fadac70c65964a9a486.zip | |
Merge patch series "fixes for uncached IO"
Two fixes for uncached IO.
* patches from https://lore.kernel.org/r/20250218120209.88093-1-jefflexu@linux.alibaba.com:
mm/truncate: don't skip dirty page in folio_unmap_invalidate()
mm/filemap: fix miscalculated file range for filemap_fdatawrite_range_kick()
Link: https://lore.kernel.org/r/20250218120209.88093-1-jefflexu@linux.alibaba.com
Signed-off-by: Christian Brauner <brauner@kernel.org>
| -rw-r--r-- | include/linux/fs.h | 4 | ||||
| -rw-r--r-- | mm/filemap.c | 2 | ||||
| -rw-r--r-- | mm/truncate.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 9346adf28f7b..2788df98080f 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2975,8 +2975,8 @@ static inline ssize_t generic_write_sync(struct kiocb *iocb, ssize_t count) } else if (iocb->ki_flags & IOCB_DONTCACHE) { struct address_space *mapping = iocb->ki_filp->f_mapping; - filemap_fdatawrite_range_kick(mapping, iocb->ki_pos, - iocb->ki_pos + count); + filemap_fdatawrite_range_kick(mapping, iocb->ki_pos - count, + iocb->ki_pos - 1); } return count; diff --git a/mm/filemap.c b/mm/filemap.c index 804d7365680c..d4564a79eb35 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -445,7 +445,7 @@ EXPORT_SYMBOL(filemap_fdatawrite_range); * filemap_fdatawrite_range_kick - start writeback on a range * @mapping: target address_space * @start: index to start writeback on - * @end: last (non-inclusive) index for writeback + * @end: last (inclusive) index for writeback * * This is a non-integrity writeback helper, to start writing back folios * for the indicated range. diff --git a/mm/truncate.c b/mm/truncate.c index e2e115adfbc5..76d8fcd89bd0 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -548,8 +548,6 @@ int folio_unmap_invalidate(struct address_space *mapping, struct folio *folio, VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); - if (folio_test_dirty(folio)) - return 0; if (folio_mapped(folio)) unmap_mapping_folio(folio); BUG_ON(folio_mapped(folio)); |