From 86e74dc162bd41c61b5876ea15c17da3e516ef39 Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Wed, 4 Nov 2020 21:47:14 +0000 Subject: [PATCH] Remove redundant oid parameter to update_pages The oid comes from the znode we are already passing. Reviewed-by: Brian Behlendorf Reviewed-by: Matt Macy Reviewed-by: Alexander Motin Signed-off-by: Ryan Moeller Closes #11176 --- include/sys/zfs_vnops.h | 2 +- module/os/freebsd/zfs/zfs_vnops_os.c | 6 +++--- module/os/linux/zfs/zfs_vnops_os.c | 7 +++---- module/zfs/zfs_vnops.c | 3 +-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/include/sys/zfs_vnops.h b/include/sys/zfs_vnops.h index e59925342..6b5d9726c 100644 --- a/include/sys/zfs_vnops.h +++ b/include/sys/zfs_vnops.h @@ -34,6 +34,6 @@ extern int zfs_setsecattr(znode_t *zp, vsecattr_t *vsecp, int flag, cred_t *cr); extern int mappedread(znode_t *, int, uio_t *); extern int mappedread_sf(znode_t *, int, uio_t *); -extern void update_pages(znode_t *, int64_t, int, objset_t *, uint64_t); +extern void update_pages(znode_t *, int64_t, int, objset_t *); #endif diff --git a/module/os/freebsd/zfs/zfs_vnops_os.c b/module/os/freebsd/zfs/zfs_vnops_os.c index abb96f529..4b07a8a14 100644 --- a/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/module/os/freebsd/zfs/zfs_vnops_os.c @@ -526,7 +526,7 @@ page_unhold(vm_page_t pp) * the page and the dmu buffer. */ void -update_pages(znode_t *zp, int64_t start, int len, objset_t *os, uint64_t oid) +update_pages(znode_t *zp, int64_t start, int len, objset_t *os) { vm_object_t obj; struct sf_buf *sf; @@ -551,8 +551,8 @@ update_pages(znode_t *zp, int64_t start, int len, objset_t *os, uint64_t oid) zfs_vmobject_wunlock_12(obj); va = zfs_map_page(pp, &sf); - (void) dmu_read(os, oid, start+off, nbytes, - va+off, DMU_READ_PREFETCH); + (void) dmu_read(os, zp->z_id, start + off, nbytes, + va + off, DMU_READ_PREFETCH); zfs_unmap_page(sf); zfs_vmobject_wlock_12(obj); diff --git a/module/os/linux/zfs/zfs_vnops_os.c b/module/os/linux/zfs/zfs_vnops_os.c index 2469769bc..b1d6a7b23 100644 --- a/module/os/linux/zfs/zfs_vnops_os.c +++ b/module/os/linux/zfs/zfs_vnops_os.c @@ -321,8 +321,7 @@ zfs_holey(struct inode *ip, int cmd, loff_t *off) * the page and the dmu buffer. */ void -update_pages(znode_t *zp, int64_t start, int len, - objset_t *os, uint64_t oid) +update_pages(znode_t *zp, int64_t start, int len, objset_t *os) { struct inode *ip = ZTOI(zp); struct address_space *mp = ip->i_mapping; @@ -341,8 +340,8 @@ update_pages(znode_t *zp, int64_t start, int len, flush_dcache_page(pp); pb = kmap(pp); - (void) dmu_read(os, oid, start+off, nbytes, pb+off, - DMU_READ_PREFETCH); + (void) dmu_read(os, zp->z_id, start + off, nbytes, + pb + off, DMU_READ_PREFETCH); kunmap(pp); if (mapping_writably_mapped(mp)) diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c index e478f5634..4cc01753e 100644 --- a/module/zfs/zfs_vnops.c +++ b/module/zfs/zfs_vnops.c @@ -489,8 +489,7 @@ zfs_write(znode_t *zp, uio_t *uio, int ioflag, cred_t *cr) } if (tx_bytes && zn_has_cached_data(zp) && !(ioflag & O_DIRECT)) { - update_pages(zp, woff, - tx_bytes, zfsvfs->z_os, zp->z_id); + update_pages(zp, woff, tx_bytes, zfsvfs->z_os); } /*