d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zfs mappedread, update_pages: use int for offset and length within a page

Browse Source 
uint64_t, int64_t were redundant there

Approved by:	pjd
Tested by:	tools/regression/fsx
MFC after:	2 weeks
This commit is contained in:
Andriy Gapon 2010-09-15 10:48:16 +00:00
parent c002c3e8c2
commit 0b1ca38a69
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
View File

@ -387,7 +387,7 @@ update_pages(vnode_t *vp, int64_t start, int len, objset_t *os, uint64_t oid,
{
vm_object_t obj;
struct sf_buf *sf;
int64_t off;
int off;
ASSERT(vp->v_mount != NULL);
obj = vp->v_object;
@ -397,7 +397,7 @@ update_pages(vnode_t *vp, int64_t start, int len, objset_t *os, uint64_t oid,
VM_OBJECT_LOCK(obj);
for (start &= PAGEMASK; len > 0; start += PAGESIZE) {
vm_page_t pp;
uint64_t nbytes = MIN(PAGESIZE - off, len);
int nbytes = MIN(PAGESIZE - off, len);
if ((pp = page_lookup(vp, start, off, nbytes)) != NULL) {
caddr_t va;
@ -440,9 +440,10 @@ mappedread(vnode_t *vp, int nbytes, uio_t *uio)
vm_object_t obj;
vm_page_t m;
struct sf_buf *sf;
int64_t start, off;
int64_t start;
caddr_t va;
int len = nbytes;
int off;
int error = 0;
uint64_t dirbytes;
@ -455,11 +456,11 @@ mappedread(vnode_t *vp, int nbytes, uio_t *uio)
dirbytes = 0;
VM_OBJECT_LOCK(obj);
for (start &= PAGEMASK; len > 0; start += PAGESIZE) {
uint64_t bytes = MIN(PAGESIZE - off, len);
int bytes = MIN(PAGESIZE - off, len);
again:
if ((m = vm_page_lookup(obj, OFF_TO_IDX(start))) != NULL &&
vm_page_is_valid(m, (vm_offset_t)off, bytes)) {
vm_page_is_valid(m, off, bytes)) {
if ((m->oflags & VPO_BUSY) != 0) {
/*
* Reference the page before unlocking and