summaryrefslogtreecommitdiffstats
path: root/sys/fs
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2014-03-22 10:26:09 +0000
committerbdrewery <bdrewery@FreeBSD.org>2014-03-22 10:26:09 +0000
commit6fcf6199a4a9aefe9f2e59d947f0e0df171367b5 (patch)
tree9a9561ab626d2c7b17fbd98a498de2fac743ab08 /sys/fs
parente97a0e252b398acead00694bf1d357d9089128ad (diff)
downloadFreeBSD-src-6fcf6199a4a9aefe9f2e59d947f0e0df171367b5.zip
FreeBSD-src-6fcf6199a4a9aefe9f2e59d947f0e0df171367b5.tar.gz
Rename global cnt to vm_cnt to avoid shadowing.
To reduce the diff struct pcu.cnt field was not renamed, so PCPU_OP(cnt.field) is still used. pc_cnt and pcpu are also used in kvm(3) and vmstat(8). The goal was to not affect externally used KPI. Bump __FreeBSD_version_ in case some out-of-tree module/code relies on the the global cnt variable. Exp-run revealed no ports using it directly. No objection from: arch@ Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/tmpfs/tmpfs_subr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c
index f4508c6..a9a690e 100644
--- a/sys/fs/tmpfs/tmpfs_subr.c
+++ b/sys/fs/tmpfs/tmpfs_subr.c
@@ -104,7 +104,7 @@ tmpfs_mem_avail(void)
{
vm_ooffset_t avail;
- avail = swap_pager_avail + cnt.v_free_count + cnt.v_cache_count -
+ avail = swap_pager_avail + vm_cnt.v_free_count + vm_cnt.v_cache_count -
tmpfs_pages_reserved;
if (__predict_false(avail < 0))
avail = 0;
OpenPOWER on IntegriCloud