c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 02:27:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant oid parameter to update_pages

Browse Source 
The oid comes from the znode we are already passing.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Matt Macy <mmacy@FreeBSD.org>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #11176
This commit is contained in:
Ryan Moeller
2020-11-04 21:47:14 +00:00
committed by Brian Behlendorf
parent eec6646ea9
commit 8a9634e2f3
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/os/freebsd/zfs/zfs_vnops_os.c
+3 -3
View File
@@ -465,7 +465,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;
@@ -490,8 +490,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);
module/os/linux/zfs/zfs_vnops_os.c
+3 -4
View File
@@ -249,8 +249,7 @@ zfs_close(struct inode *ip, int flag, cred_t *cr)
* 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;
@@ -269,8 +268,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))