github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-12 12:34:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

xfs: simplify building the bio in xlog_write_iclog

Browse Source 
Use the bio_add_virt_nofail and bio_add_vmalloc helpers to abstract
away the details of the memory allocation.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Link: https://lore.kernel.org/r/20250507120451.4000627-18-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2025-05-07 14:04:41 +02:00 committed by Jens Axboe
parent d486bbecc9
commit 5ced480d48
1 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fs/xfs/xfs_log.c
View File

@ -1607,27 +1607,6 @@ xlog_bio_end_io(
&iclog->ic_end_io_work); &iclog->ic_end_io_work);
} }
static int
xlog_map_iclog_data(
struct bio *bio,
void *data,
size_t count)
{
do {
struct page *page = kmem_to_page(data);
unsigned int off = offset_in_page(data);
size_t len = min_t(size_t, count, PAGE_SIZE - off);
if (bio_add_page(bio, page, len, off) != len)
return -EIO;
data += len;
count -= len;
} while (count);
return 0;
}
STATIC void STATIC void
xlog_write_iclog( xlog_write_iclog(
struct xlog *log, struct xlog *log,
@ -1693,11 +1672,12 @@ xlog_write_iclog(
iclog->ic_flags &= ~(XLOG_ICL_NEED_FLUSH | XLOG_ICL_NEED_FUA); iclog->ic_flags &= ~(XLOG_ICL_NEED_FLUSH | XLOG_ICL_NEED_FUA);
if (xlog_map_iclog_data(&iclog->ic_bio, iclog->ic_data, count)) if (is_vmalloc_addr(iclog->ic_data)) {
if (!bio_add_vmalloc(&iclog->ic_bio, iclog->ic_data, count))
goto shutdown; goto shutdown;
} else {
if (is_vmalloc_addr(iclog->ic_data)) bio_add_virt_nofail(&iclog->ic_bio, iclog->ic_data, count);
flush_kernel_vmap_range(iclog->ic_data, count); }
/* /*
* If this log buffer would straddle the end of the log we will have * If this log buffer would straddle the end of the log we will have