]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge branch 'vfs-6.15.shared.iomap' of gitolite.kernel.org:pub/scm/linux/kernel...
authorChristian Brauner <brauner@kernel.org>
Thu, 6 Mar 2025 09:59:18 +0000 (10:59 +0100)
committerChristian Brauner <brauner@kernel.org>
Thu, 6 Mar 2025 09:59:18 +0000 (10:59 +0100)
Bring in iomap changes that xfs relies on.

Signed-off-by: Christian Brauner <brauner@kernel.org>
1  2 
Documentation/filesystems/iomap/design.rst
Documentation/filesystems/iomap/operations.rst
fs/iomap/buffered-io.c
fs/xfs/xfs_file.c
include/linux/iomap.h

index ea5e32d810d50fc89f0c91c7e60f245c53d9f46f,ea863c3cf51018f7dc3b348abbacf92ebbeddc15..d52cfdc299c4e3c8a24e656fdcc9ff20c617c1f5
@@@ -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;
Simple merge
Simple merge