Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'iomap-6.1-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull iomap updates from Darrick Wong:
"It's pretty quiet this time around -- a UAF bugfix and a new
tracepoint so we can watch file writeback:
- Fix a UAF bug when recording writeback mapping errors
- Add a tracepoint so that we can monitor writeback mappings"
* tag 'iomap-6.1-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
iomap: add a tracepoint for mappings returned by map_blocks
iomap: iomap: fix memory corruption when recording errors during writeback
+3
-1
+2
-1
fs/iomap/buffered-io.c
+2
-1
fs/iomap/buffered-io.c
···
1360
1360
error = wpc->ops->map_blocks(wpc, inode, pos);
1361
1361
if (error)
1362
1362
break;
1363
+
trace_iomap_writepage_map(inode, &wpc->iomap);
1363
1364
if (WARN_ON_ONCE(wpc->iomap.type == IOMAP_INLINE))
1364
1365
continue;
1365
1366
if (wpc->iomap.type == IOMAP_HOLE)
···
1422
1421
if (!count)
1423
1422
folio_end_writeback(folio);
1424
1423
done:
1425
-
mapping_set_error(folio->mapping, error);
1424
+
mapping_set_error(inode->i_mapping, error);
1426
1425
return error;
1427
1426
}
1428
1427