svn commit: r366367 - head/sys/kern

[Mark Johnston]

Author: markj
Date: Fri Oct  2 17:49:13 2020
New Revision: 366367
URL: https://svnweb.freebsd.org/changeset/base/366367

Log:
  Simplify the check for non-dumpable VM object types
  
  OBJT_DEFAULT, _SWAP, _VNODE and _PHYS is exactly the set of
  non-fictitious object types, so just check for OBJ_FICTITIOUS.  The
  check no longer excludes dead objects, but such objects have to be
  handled regardless.
  
  No functional change intended.
  
  Reviewed by:	alc, dougm, kib
  Tested by:	pho
  MFC after:	2 weeks
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D26589

Modified:
  head/sys/kern/imgact_elf.c

Modified: head/sys/kern/imgact_elf.c
==============================================================================
--- head/sys/kern/imgact_elf.c	Fri Oct  2 17:33:56 2020	(r366366)
+++ head/sys/kern/imgact_elf.c	Fri Oct  2 17:49:13 2020	(r366367)
@@ -1760,7 +1760,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);
 	VM_MAP_ENTRY_FOREACH(entry, map) {
@@ -1799,9 +1799,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;