aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMateusz Guzik <mjg@FreeBSD.org>2021-05-14 07:50:10 +0000
committerMateusz Guzik <mjg@FreeBSD.org>2021-05-22 18:28:29 +0000
commit90b82ea9a64fe3bc1c5caa26228d1983b9681fa1 (patch)
tree764b2f2177f10818c5d0b7e7e2c476f1cbff6196
parent8a0ec6bd40e8f2c451de025d55b1637dde77d982 (diff)
downloadsrc-90b82ea9a64fe3bc1c5caa26228d1983b9681fa1.tar.gz
src-90b82ea9a64fe3bc1c5caa26228d1983b9681fa1.zip
vm: add another pager private flag
Contrary to what was done in main, skip the following in order to not disrupt KBI: Move OBJ_SHADOWLIST around to let pager flags be next to each other. (cherry picked from commit 128e25842ef510b39815d784e1d2af0d4afd584f)
-rw-r--r--sys/fs/tmpfs/tmpfs.h2
-rw-r--r--sys/vm/vm_object.h5
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..adbe022417f4 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_PAGERPRIV2 0x0100 /* Pager private */
#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_SHADOWLIST 0x8000 /* Object is on the shadow list. */
/*
* Helpers to perform conversion between vm_object page indexes and offsets.