The branch main has been updated by mjg:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=128e25842ef510b39815d784e1d2af0d4afd584f

commit 128e25842ef510b39815d784e1d2af0d4afd584f
Author:     Mateusz Guzik <[email protected]>
AuthorDate: 2021-05-14 07:50:10 +0000
Commit:     Mateusz Guzik <[email protected]>
CommitDate: 2021-05-15 20:47:29 +0000

    vm: add another pager private flag
    
    Move OBJ_SHADOWLIST around to let pager flags be next to each other.
    
    Reviewed by:    kib, markj
    Differential Revision:  https://reviews.freebsd.org/D30258
---
 sys/fs/tmpfs/tmpfs.h | 2 +-
 sys/vm/vm_object.h   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sys/fs/tmpfs/tmpfs.h b/sys/fs/tmpfs/tmpfs.h
index 549339d9b6d1..bb777e29e3d0 100644
--- a/sys/fs/tmpfs/tmpfs.h
+++ b/sys/fs/tmpfs/tmpfs.h
@@ -45,7 +45,7 @@
 MALLOC_DECLARE(M_TMPFSNAME);
 #endif
 
-#define        OBJ_TMPFS       OBJ_PAGERPRIV   /* has tmpfs vnode allocated */
+#define        OBJ_TMPFS       OBJ_PAGERPRIV1  /* has tmpfs vnode allocated */
 
 /*
  * Internal representation of a tmpfs directory entry.
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index d159c621d2e6..1bf4cee856c7 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -201,13 +201,14 @@ struct vm_object {
 #define        OBJ_UMTXDEAD    0x0020          /* umtx pshared was terminated 
*/
 #define        OBJ_SIZEVNLOCK  0x0040          /* lock vnode to check obj size 
*/
 #define        OBJ_PG_DTOR     0x0080          /* dont reset object, leave 
that for dtor */
+#define        OBJ_SHADOWLIST  0x0100          /* Object is on the shadow 
list. */
 #define        OBJ_SWAP        0x0200          /* object swaps */
 #define        OBJ_SPLIT       0x0400          /* object is being split */
 #define        OBJ_COLLAPSING  0x0800          /* Parent of collapse. */
 #define        OBJ_COLORED     0x1000          /* pg_color is defined */
 #define        OBJ_ONEMAPPING  0x2000          /* One USE (a single, 
non-forked) mapping flag */
-#define        OBJ_SHADOWLIST  0x4000          /* Object is on the shadow 
list. */
-#define        OBJ_PAGERPRIV   0x8000          /* Pager private */
+#define        OBJ_PAGERPRIV1  0x4000          /* Pager private */
+#define        OBJ_PAGERPRIV2  0x8000          /* Pager private */
 
 /*
  * Helpers to perform conversion between vm_object page indexes and offsets.
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "[email protected]"

Reply via email to