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

torvalds · torvalds · commit a901a3568fd2 · 2023-07-02T11:14:54.000-07:00
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
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -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
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
@@ -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;

-Original file line number
+Diff line change
 F:	drivers/net/ethernet/sgi/ioc3-eth.c
 IOMAP FILESYSTEM LIBRARY
 -M:	Christoph Hellwig <[email protected]>
 M:	Darrick J. Wong <[email protected]>
 L:	[email protected]
 L:	[email protected]
Original file line number	Diff line number	Diff line change
`@@ -1076,7 +1076,7 @@ int iomap_file_buffered_write_punch_delalloc(struct inode *inode,`
`1076`	`1076`	`{`
`1077`	`1077`	`loff_t start_byte;`
`1078`	`1078`	`loff_t end_byte;`
`1079`		`- int blocksize = i_blocksize(inode);`
	`1079`	`+ unsigned int blocksize = i_blocksize(inode);`
`1080`	`1080`
`1081`	`1081`	`if (iomap->type != IOMAP_DELALLOC)`
`1082`	`1082`	`return 0;`