Unverified Commit 1743d385 authored by Christian Brauner's avatar Christian Brauner
Browse files

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: default avatarChristian Brauner <brauner@kernel.org>
parents 53cfafdd 13368df5

Documentation/filesystems/iomap/design.rst

+5 −0
Original line number Diff line number Diff line
@@ -356,6 +356,11 @@ operations: 
   ``IOMAP_NOWAIT`` is often set on behalf of ``IOCB_NOWAIT`` or

   ``RWF_NOWAIT``.



 * ``IOMAP_DONTCACHE`` is set when the caller wishes to perform a

   buffered file I/O and would like the kernel to drop the pagecache

   after the I/O completes, if it isn't already being used by another

   thread.



If it is necessary to read existing file contents from a `different

<https://lore.kernel.org/all/20191008071527.29304-9-hch@lst.de/>`_

device or address range on a device, the filesystem should return that

Documentation/filesystems/iomap/operations.rst

+2 −0
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ These ``struct kiocb`` flags are significant for buffered I/O with iomap: 


 * ``IOCB_NOWAIT``: Turns on ``IOMAP_NOWAIT``.



 * ``IOCB_DONTCACHE``: Turns on ``IOMAP_DONTCACHE``.



Internal per-Folio State

------------------------

fs/iomap/buffered-io.c

+4 −0
Original line number Diff line number Diff line
@@ -594,6 +594,8 @@ struct folio *iomap_get_folio(struct iomap_iter *iter, loff_t pos, size_t len) 


	if (iter->flags & IOMAP_NOWAIT)

		fgp |= FGP_NOWAIT;

	if (iter->flags & IOMAP_DONTCACHE)

		fgp |= FGP_DONTCACHE;

	fgp |= fgf_set_order(len);



	return __filemap_get_folio(iter->inode->i_mapping, pos >> PAGE_SHIFT,
@@ -1019,6 +1021,8 @@ iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *i, 


	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.status = iomap_write_iter(&iter, i);

fs/xfs/xfs_file.c

+2 −1
Original line number Diff line number Diff line
@@ -1627,7 +1627,8 @@ const struct file_operations xfs_file_operations = { 
	.fadvise	= xfs_file_fadvise,

	.remap_file_range = xfs_file_remap_range,

	.fop_flags	= FOP_MMAP_SYNC | FOP_BUFFER_RASYNC |

			  FOP_BUFFER_WASYNC | FOP_DIO_PARALLEL_WRITE,

			  FOP_BUFFER_WASYNC | FOP_DIO_PARALLEL_WRITE |

			  FOP_DONTCACHE,

};



const struct file_operations xfs_dir_file_operations = {

include/linux/iomap.h

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ struct iomap_folio_ops { 
#define IOMAP_DAX		0

#endif /* CONFIG_FS_DAX */

#define IOMAP_ATOMIC		(1 << 9)

#define IOMAP_DONTCACHE		(1 << 10)



struct iomap_ops {

	/*