system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-20 16:54:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate OBJ_NEEDGIANT. After r188331, OBJ_NEEDGIANT's only use is by a

Browse source 
redundant assertion in vm_fault().

Reviewed by:	kib
This commit is contained in:
Alan Cox 2009-02-08 22:17:24 +00:00
parent a8d4700dbb
commit 7b54b1a9f5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=188348
4 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sys/vm/vm_fault.c
View file

@ -567,9 +567,6 @@ RetryFault:;
vnode_locked:
KASSERT(fs.vp == NULL || !fs.map->system_map,
("vm_fault: vnode-backed object mapped by system map"));
KASSERT((fs.first_object->flags & OBJ_NEEDGIANT) == 0 ||
!fs.map->system_map,
("vm_fault: Object requiring giant mapped by system map"));
/*
* now we find out if any other pages should be paged

5
sys/vm/vm_object.c
View file

@ -1273,11 +1273,9 @@ vm_object_shadow(
source->shadow_count++;
source->generation++;
#if VM_NRESERVLEVEL > 0
result->flags |= source->flags & (OBJ_NEEDGIANT | OBJ_COLORED);
result->flags |= source->flags & OBJ_COLORED;
result->pg_color = (source->pg_color + OFF_TO_IDX(*offset)) &
((1 << (VM_NFREEORDER - 1)) - 1);
#else
result->flags |= source->flags & OBJ_NEEDGIANT;
#endif
VM_OBJECT_UNLOCK(source);
}
@ -1349,7 +1347,6 @@ vm_object_split(vm_map_entry_t entry)
orig_object->backing_object_offset + entry->offset;
new_object->backing_object = source;
}
new_object->flags |= orig_object->flags & OBJ_NEEDGIANT;
retry:
if ((m = TAILQ_FIRST(&orig_object->memq)) != NULL) {
if (m->pindex < offidxstart) {

1
sys/vm/vm_object.h
View file

@ -147,7 +147,6 @@ struct vm_object {
#define OBJ_COLORED 0x1000 /* pg_color is defined */
#define OBJ_ONEMAPPING 0x2000 /* One USE (a single, non-forked) mapping flag */
#define OBJ_DISCONNECTWNT 0x4000 /* disconnect from vnode wanted */
#define OBJ_NEEDGIANT 0x8000 /* object requires Giant */
#define IDX_TO_OFF(idx) (((vm_ooffset_t)(idx)) << PAGE_SHIFT)
#define OFF_TO_IDX(off) ((vm_pindex_t)(((vm_ooffset_t)(off)) >> PAGE_SHIFT))

2
sys/vm/vnode_pager.c
View file

@ -223,8 +223,6 @@ vnode_pager_alloc(void *handle, vm_ooffset_t size, vm_prot_t prot,
object->un_pager.vnp.vnp_size = size;
object->handle = handle;
if (VFS_NEEDSGIANT(vp->v_mount))
vm_object_set_flag(object, OBJ_NEEDGIANT);
VI_LOCK(vp);
if (vp->v_object != NULL) {
/*