From 374a548a53b60d032d0c5bc632d64ac100c235f3 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Sat, 9 Sep 2017 10:15:24 -0700 Subject: [PATCH] hammer - Adjust hammer to new breadnx / cluster_readx API * API adjustments for breadnx() and cluster_readx() calls --- sys/vfs/hammer/hammer_io.c | 2 ++ sys/vfs/hammer/hammer_vnops.c | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/vfs/hammer/hammer_io.c b/sys/vfs/hammer/hammer_io.c index 2f022218a4..9a9516e82f 100644 --- a/sys/vfs/hammer/hammer_io.c +++ b/sys/vfs/hammer/hammer_io.c @@ -1586,12 +1586,14 @@ hammer_io_indirect_read(hammer_mount_t hmp, struct bio *bio, limit -= zone2_offset; cluster_readcb(volume->devvp, limit, buf_offset, bp->b_bufsize, + B_NOTMETA, HAMMER_CLUSTER_SIZE, HAMMER_CLUSTER_SIZE * hce, hammer_indirect_callback, bio); } else { breadcb(volume->devvp, buf_offset, bp->b_bufsize, + B_NOTMETA, hammer_indirect_callback, bio); } } diff --git a/sys/vfs/hammer/hammer_vnops.c b/sys/vfs/hammer/hammer_vnops.c index f4a99cd763..9b6b6fab8b 100644 --- a/sys/vfs/hammer/hammer_vnops.c +++ b/sys/vfs/hammer/hammer_vnops.c @@ -412,10 +412,13 @@ hammer_vop_read(struct vop_read_args *ap) } error = cluster_readx(ap->a_vp, file_limit, base_offset, - blksize, uio->uio_resid, - seqcount * MAXBSIZE, &bp); + blksize, B_NOTMETA, + uio->uio_resid, + seqcount * MAXBSIZE, + &bp); } else { - error = breadnx(ap->a_vp, base_offset, blksize, + error = breadnx(ap->a_vp, base_offset, + blksize, B_NOTMETA, NULL, NULL, 0, &bp); } if (error) { -- 2.11.4.GIT