From: Christian Brauner <brauner@kernel.org>
Date: Thu, 6 Mar 2025 09:59:18 +0000 (+0100)
Subject: Merge branch 'vfs-6.15.shared.iomap' of gitolite.kernel.org:pub/scm/linux/kernel... 
X-Git-Tag: v6.15-rc1~249^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1743d385e704c41ef028697ef44eeab987d5f5a2;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'vfs-6.15.shared.iomap' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs

Bring in iomap changes that xfs relies on.

Signed-off-by: Christian Brauner <brauner@kernel.org>
---

1743d385e704c41ef028697ef44eeab987d5f5a2
diff --cc fs/iomap/buffered-io.c
index ea5e32d810d50,ea863c3cf5101..d52cfdc299c4e
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@@ -1019,9 -1036,11 +1021,11 @@@ iomap_file_buffered_write(struct kiocb 
  
  	if (iocb->ki_flags & IOCB_NOWAIT)
  		iter.flags |= IOMAP_NOWAIT;
+ 	if (iocb->ki_flags & IOCB_DONTCACHE)
+ 		iter.flags |= IOMAP_DONTCACHE;
  
  	while ((ret = iomap_iter(&iter, ops)) > 0)
 -		iter.processed = iomap_write_iter(&iter, i);
 +		iter.status = iomap_write_iter(&iter, i);
  
  	if (unlikely(iter.pos == iocb->ki_pos))
  		return ret;