diff options
| author | kib <kib@FreeBSD.org> | 2017-01-26 10:19:53 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2017-01-26 10:19:53 +0000 |
| commit | 141cc187fd70c1100c56386ec4214e37f78c023b (patch) | |
| tree | 85f9047402d627e8965c457f81d8ed0a60603b01 /sys/fs/tmpfs/tmpfs_subr.c | |
| parent | 82e86dbbf49dc49af534b71619228971159f6526 (diff) | |
| download | FreeBSD-src-141cc187fd70c1100c56386ec4214e37f78c023b.zip FreeBSD-src-141cc187fd70c1100c56386ec4214e37f78c023b.tar.gz | |
MFC r312124 (by mjg):
tmpfs: manage tm_pages_used with atomics.
Diffstat (limited to 'sys/fs/tmpfs/tmpfs_subr.c')
| -rw-r--r-- | sys/fs/tmpfs/tmpfs_subr.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c index ce54e7d..f191840 100644 --- a/sys/fs/tmpfs/tmpfs_subr.c +++ b/sys/fs/tmpfs/tmpfs_subr.c @@ -130,7 +130,7 @@ tmpfs_pages_check_avail(struct tmpfs_mount *tmp, size_t req_pages) if (tmpfs_mem_avail() < req_pages) return (0); - if (tmp->tm_pages_max != SIZE_MAX && + if (tmp->tm_pages_max != ULONG_MAX && tmp->tm_pages_max < req_pages + tmpfs_pages_used(tmp)) return (0); @@ -328,9 +328,7 @@ tmpfs_free_node(struct tmpfs_mount *tmp, struct tmpfs_node *node) case VREG: uobj = node->tn_reg.tn_aobj; if (uobj != NULL) { - TMPFS_LOCK(tmp); - tmp->tm_pages_used -= uobj->size; - TMPFS_UNLOCK(tmp); + atomic_subtract_long(&tmp->tm_pages_used, uobj->size); KASSERT((uobj->flags & OBJ_TMPFS) == 0, ("leaked OBJ_TMPFS node %p vm_obj %p", node, uobj)); vm_object_deallocate(uobj); @@ -1413,9 +1411,7 @@ retry: uobj->size = newpages; VM_OBJECT_WUNLOCK(uobj); - TMPFS_LOCK(tmp); - tmp->tm_pages_used += (newpages - oldpages); - TMPFS_UNLOCK(tmp); + atomic_add_long(&tmp->tm_pages_used, newpages - oldpages); node->tn_size = newsize; return (0); |
