svn commit: r366762 - stable/12/sys/kern

[Mark Johnston]

Author: markj
Date: Fri Oct 16 13:34:56 2020
New Revision: 366762
URL: https://svnweb.freebsd.org/changeset/base/366762

Log:
  MFC r366367:
  Simplify the check for non-dumpable VM object types

Modified:
  stable/12/sys/kern/imgact_elf.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/kern/imgact_elf.c
==============================================================================
--- stable/12/sys/kern/imgact_elf.c	Fri Oct 16 13:05:30 2020	(r366761)
+++ stable/12/sys/kern/imgact_elf.c	Fri Oct 16 13:34:56 2020	(r366762)
@@ -1742,7 +1742,7 @@ each_dumpable_segment(struct thread *td, segment_callb
 	vm_map_t map = &p->p_vmspace->vm_map;
 	vm_map_entry_t entry;
 	vm_object_t backing_object, object;
-	boolean_t ignore_entry;
+	bool ignore_entry;
 
 	vm_map_lock_read(map);
 	for (entry = map->header.next; entry != &map->header;
@@ -1782,9 +1782,7 @@ each_dumpable_segment(struct thread *td, segment_callb
 			VM_OBJECT_RUNLOCK(object);
 			object = backing_object;
 		}
-		ignore_entry = object->type != OBJT_DEFAULT &&
-		    object->type != OBJT_SWAP && object->type != OBJT_VNODE &&
-		    object->type != OBJT_PHYS;
+		ignore_entry = (object->flags & OBJ_FICTITIOUS) != 0;
 		VM_OBJECT_RUNLOCK(object);
 		if (ignore_entry)
 			continue;