Commit a901a356 authored Jul 02, 2023 by Linus Torvalds

Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

Pull iomap updates from Darrick Wong:

 - Fix a type signature mismatch

 - Drop Christoph as maintainer

* tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  iomap: drop me [hch] from MAINTAINERS for iomap
  fs: iomap: Change the type of blocksize from 'int' to 'unsigned int' in iomap_file_buffered_write_punch_delalloc

parents 28c7980f 447a0bc1

MAINTAINERS

+0 −1

Original line number	Diff line number	Diff line
		@@ -10883,7 +10883,6 @@ S: Maintained
		F: drivers/net/ethernet/sgi/ioc3-eth.c

		IOMAP FILESYSTEM LIBRARY
		M: Christoph Hellwig <hch@infradead.org>
		M: Darrick J. Wong <djwong@kernel.org>
		L: linux-xfs@vger.kernel.org
		L: linux-fsdevel@vger.kernel.org

fs/iomap/buffered-io.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1076,7 +1076,7 @@ int iomap_file_buffered_write_punch_delalloc(struct inode *inode,
		{
		loff_t start_byte;
		loff_t end_byte;
		int blocksize = i_blocksize(inode);
		unsigned int blocksize = i_blocksize(inode);

		if (iomap->type != IOMAP_DELALLOC)
		return 0;