diff options
author | alc <alc@FreeBSD.org> | 2006-07-21 06:40:29 +0000 |
---|---|---|
committer | alc <alc@FreeBSD.org> | 2006-07-21 06:40:29 +0000 |
commit | d0e4b9565d4fdb1bae61d31013f9f75e4498d602 (patch) | |
tree | 97d1eb7ef22e85728d524efb5dcdf0ec2d58a0af /sys/vm | |
parent | 51bab356f57dc9ab730b9fc77fc11ee8039d2a02 (diff) | |
download | FreeBSD-src-d0e4b9565d4fdb1bae61d31013f9f75e4498d602.zip FreeBSD-src-d0e4b9565d4fdb1bae61d31013f9f75e4498d602.tar.gz |
Eliminate OBJ_WRITEABLE. It hasn't been used in a long time.
Diffstat (limited to 'sys/vm')
-rw-r--r-- | sys/vm/vm_object.c | 7 | ||||
-rw-r--r-- | sys/vm/vm_object.h | 1 | ||||
-rw-r--r-- | sys/vm/vm_page.c | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index cacaafa..5572f2d 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -806,7 +806,7 @@ vm_object_page_clean(vm_object_t object, vm_pindex_t start, vm_pindex_t end, int if (clearobjflags && (tstart == 0) && (tend == object->size)) { struct vnode *vp; - vm_object_clear_flag(object, OBJ_WRITEABLE|OBJ_MIGHTBEDIRTY); + vm_object_clear_flag(object, OBJ_MIGHTBEDIRTY); if (object->type == OBJT_VNODE && (vp = (struct vnode *)object->handle) != NULL) { VI_LOCK(vp); @@ -1920,10 +1920,9 @@ vm_object_set_writeable_dirty(vm_object_t object) struct vnode *vp; VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); - if ((object->flags & (OBJ_MIGHTBEDIRTY|OBJ_WRITEABLE)) == - (OBJ_MIGHTBEDIRTY|OBJ_WRITEABLE)) + if ((object->flags & OBJ_MIGHTBEDIRTY) != 0) return; - vm_object_set_flag(object, OBJ_WRITEABLE|OBJ_MIGHTBEDIRTY); + vm_object_set_flag(object, OBJ_MIGHTBEDIRTY); if (object->type == OBJT_VNODE && (vp = (struct vnode *)object->handle) != NULL) { VI_LOCK(vp); diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index b2f5641..5a3f3c7 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -140,7 +140,6 @@ struct vm_object { #define OBJ_DEAD 0x0008 /* dead objects (during rundown) */ #define OBJ_NOSPLIT 0x0010 /* dont split this object */ #define OBJ_PIPWNT 0x0040 /* paging in progress wanted */ -#define OBJ_WRITEABLE 0x0080 /* object has been made writable */ #define OBJ_MIGHTBEDIRTY 0x0100 /* object might be dirty */ #define OBJ_CLEANING 0x0200 #define OBJ_ONEMAPPING 0x2000 /* One USE (a single, non-forked) mapping flag */ diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index f39bfb4..b36b1fa 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -656,7 +656,7 @@ vm_page_insert(vm_page_t m, vm_object_t object, vm_pindex_t pindex) /* * Since we are inserting a new and possibly dirty page, - * update the object's OBJ_WRITEABLE and OBJ_MIGHTBEDIRTY flags. + * update the object's OBJ_MIGHTBEDIRTY flag. */ if (m->flags & PG_WRITEABLE) vm_object_set_writeable_dirty(object); |