Unverified Commit 4c7a22bd authored by Christian Brauner's avatar Christian Brauner
Browse files

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: default avatarChristian Brauner <brauner@kernel.org>
parents b4c173df 92728998

include/linux/fs.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

mm/filemap.c

+1 −1
Original line number Diff line number Diff line
@@ -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.

mm/truncate.c

+0 −2
Original line number Diff line number Diff line
@@ -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));