diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-02 11:14:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-02 11:14:54 -0700 |
| commit | a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451 (patch) | |
| tree | f69741c34579567af3d31f68737ea322d9311892 | |
| parent | 28c7980fa14a3fbd8926686cfffb89b9542b0da1 (diff) | |
| parent | 447a0bc108e4bae4c1ea845aacf43c10c28814e8 (diff) | |
| download | net-next-a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451.tar.gz | |
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
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | fs/iomap/buffered-io.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a6621aec58f91..41385f01fa981 100644 --- 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 index a4fa81af60d9b..adb92cdb24b00 100644 --- 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; |