jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 23:10:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FBSD: Use VM_CNT_INC/VM_CNT_ADD on FreeBSD 12

Browse Source 
r317061 changed where v_vnodein &c are stored. Use the new
VM_CNT_INC/VM_CNT_ADD macros when available to accommodate.

Change-Id: I576e333ebdf9e1c6ebb14ff1a1af4c3ad89faa47
Reviewed-on: https://gerrit.openafs.org/13859
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Tim Creech <tcreech@tcreech.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
This commit is contained in:
Tim Creech 2019-08-29 22:12:41 -04:00 committed by Benjamin Kaduk
parent 81ea654494
commit e50e5ede55
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/afs/FBSD/osi_vnodeops.c
View File

@ -61,6 +61,7 @@
#include <vm/vm_object.h> #include <vm/vm_object.h>
#include <vm/vm_pager.h> #include <vm/vm_pager.h>
#include <vm/vnode_pager.h> #include <vm/vnode_pager.h>
#include <sys/vmmeter.h>
extern int afs_pbuf_freecnt; extern int afs_pbuf_freecnt;
#define GETNAME() \ #define GETNAME() \
@ -95,6 +96,14 @@ static __inline void ma_vm_page_unlock(vm_page_t m) { vm_page_unlock(m); };
#define AFS_VM_OBJECT_WUNLOCK(o) VM_OBJECT_UNLOCK(o) #define AFS_VM_OBJECT_WUNLOCK(o) VM_OBJECT_UNLOCK(o)
#endif #endif
#ifdef VM_CNT_ADD
# define AFS_VM_CNT_ADD(var, x) VM_CNT_ADD(var, x)
# define AFS_VM_CNT_INC(var) VM_CNT_INC(var)
#else
# define AFS_VM_CNT_ADD(var, x) PCPU_ADD(cnt.var, x)
# define AFS_VM_CNT_INC(var) PCPU_INC(cnt.var)
#endif
/* /*
* Mosty copied from sys/ufs/ufs/ufs_vnops.c:ufs_pathconf(). * Mosty copied from sys/ufs/ufs/ufs_vnops.c:ufs_pathconf().
* We should know the correct answers to these questions with * We should know the correct answers to these questions with
@ -533,8 +542,8 @@ afs_vop_getpages(struct vop_getpages_args *ap)
kva = (vm_offset_t) bp->b_data; kva = (vm_offset_t) bp->b_data;
pmap_qenter(kva, pages, npages); pmap_qenter(kva, pages, npages);
PCPU_INC(cnt.v_vnodein); AFS_VM_CNT_INC(v_vnodein);
PCPU_ADD(cnt.v_vnodepgsin, npages); AFS_VM_CNT_ADD(v_vnodepgsin, npages);
#ifdef FBSD_VOP_GETPAGES_BUSIED #ifdef FBSD_VOP_GETPAGES_BUSIED
count = ctob(npages); count = ctob(npages);
@ -708,8 +717,8 @@ afs_vop_putpages(struct vop_putpages_args *ap)
kva = (vm_offset_t) bp->b_data; kva = (vm_offset_t) bp->b_data;
pmap_qenter(kva, ap->a_m, npages); pmap_qenter(kva, ap->a_m, npages);
PCPU_INC(cnt.v_vnodeout); AFS_VM_CNT_INC(v_vnodeout);
PCPU_ADD(cnt.v_vnodepgsout, ap->a_count); AFS_VM_CNT_ADD(v_vnodepgsout, ap->a_count);
iov.iov_base = (caddr_t) kva; iov.iov_base = (caddr_t) kva;
iov.iov_len = ap->a_count; iov.iov_len = ap->a_count;