superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gfs2: use bdev_rw_virt in gfs2_read_super 

Switch gfs2_read_super to allocate the superblock buffer using kmalloc
which falls back to the page allocator for PAGE_SIZE allocation but
gives us a kernel virtual address and then use bdev_rw_virt to perform
the synchronous read into it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Andreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20250507120451.4000627-11-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
pull/1250/head
Christoph Hellwig 2025-05-07 14:04:34 +02:00 committed by Jens Axboe
parent a216081323
commit 65f8e62593
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fs/gfs2/ops_fstype.c
View File

@ -226,28 +226,22 @@ static void gfs2_sb_in(struct gfs2_sbd *sdp, const struct gfs2_sb *str)
static int gfs2_read_super(struct gfs2_sbd *sdp, sector_t sector, int silent) static int gfs2_read_super(struct gfs2_sbd *sdp, sector_t sector, int silent)
{ {
struct super_block *sb = sdp->sd_vfs; struct gfs2_sb *sb;
struct page *page;
struct bio_vec bvec;
struct bio bio;
int err; int err;
page = alloc_page(GFP_KERNEL); sb = kmalloc(PAGE_SIZE, GFP_KERNEL);
if (unlikely(!page)) if (unlikely(!sb))
return -ENOMEM; return -ENOMEM;
err = bdev_rw_virt(sdp->sd_vfs->s_bdev,
bio_init(&bio, sb->s_bdev, &bvec, 1, REQ_OP_READ | REQ_META); sector * (sdp->sd_vfs->s_blocksize >> 9), sb, PAGE_SIZE,
bio.bi_iter.bi_sector = sector * (sb->s_blocksize >> 9); REQ_OP_READ | REQ_META);
__bio_add_page(&bio, page, PAGE_SIZE, 0);
err = submit_bio_wait(&bio);
if (err) { if (err) {
pr_warn("error %d reading superblock\n", err); pr_warn("error %d reading superblock\n", err);
__free_page(page); kfree(sb);
return err; return err;
} }
gfs2_sb_in(sdp, page_address(page)); gfs2_sb_in(sdp, sb);
__free_page(page); kfree(sb);
return gfs2_check_sb(sdp, silent); return gfs2_check_sb(sdp, silent);
} }