From owner-svn-src-all@FreeBSD.ORG Wed Dec 29 22:26:50 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 78D54106566C; Wed, 29 Dec 2010 22:26:50 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4D6C78FC08; Wed, 29 Dec 2010 22:26:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBTMQo1w015166; Wed, 29 Dec 2010 22:26:50 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBTMQovf015162; Wed, 29 Dec 2010 22:26:50 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201012292226.oBTMQovf015162@svn.freebsd.org> From: Konstantin Belousov Date: Wed, 29 Dec 2010 22:26:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216810 - in head/sys: kern vm X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Dec 2010 22:26:50 -0000 Author: kib Date: Wed Dec 29 22:26:49 2010 New Revision: 216810 URL: http://svn.freebsd.org/changeset/base/216810 Log: Remove OBJ_CLEANING flag. The vfs_setdirty_locked_object() is the only consumer of the flag, and it used the flag because OBJ_MIGHTBEDIRTY was cleared early in vm_object_page_clean, before the cleaning pass was done. This is no longer true after r216799. Moreover, since OBJ_CLEANING is a flag, and not the counter, it could be reset too prematurely when parallel vm_object_page_clean() are performed. Reviewed by: alc (as a part of the bigger patch) MFC after: 1 month (after r216799 is merged) Modified: head/sys/kern/vfs_bio.c head/sys/vm/vm_object.c head/sys/vm/vm_object.h Modified: head/sys/kern/vfs_bio.c ============================================================================== --- head/sys/kern/vfs_bio.c Wed Dec 29 21:38:00 2010 (r216809) +++ head/sys/kern/vfs_bio.c Wed Dec 29 22:26:49 2010 (r216810) @@ -2523,7 +2523,7 @@ vfs_setdirty_locked_object(struct buf *b * We qualify the scan for modified pages on whether the * object has been flushed yet. */ - if (object->flags & (OBJ_MIGHTBEDIRTY|OBJ_CLEANING)) { + if ((object->flags & OBJ_MIGHTBEDIRTY) != 0) { vm_offset_t boffset; vm_offset_t eoffset; Modified: head/sys/vm/vm_object.c ============================================================================== --- head/sys/vm/vm_object.c Wed Dec 29 21:38:00 2010 (r216809) +++ head/sys/vm/vm_object.c Wed Dec 29 22:26:49 2010 (r216810) @@ -809,8 +809,6 @@ vm_object_page_clean(vm_object_t object, tend = (end == 0) ? object->size : end; - vm_object_set_flag(object, OBJ_CLEANING); - /* * Make the page read-only so we can then clear the object flags. * @@ -849,7 +847,6 @@ rescan: VOP_FSYNC(vp, (pagerflags & VM_PAGER_PUT_SYNC) ? MNT_WAIT : 0); #endif - vm_object_clear_flag(object, OBJ_CLEANING); if (clearobjflags && start == 0 && tend == object->size) vm_object_clear_flag(object, OBJ_MIGHTBEDIRTY); } Modified: head/sys/vm/vm_object.h ============================================================================== --- head/sys/vm/vm_object.h Wed Dec 29 21:38:00 2010 (r216809) +++ head/sys/vm/vm_object.h Wed Dec 29 22:26:49 2010 (r216810) @@ -155,7 +155,6 @@ struct vm_object { #define OBJ_NOSPLIT 0x0010 /* dont split this object */ #define OBJ_PIPWNT 0x0040 /* paging in progress wanted */ #define OBJ_MIGHTBEDIRTY 0x0100 /* object might be dirty, only for vnode */ -#define OBJ_CLEANING 0x0200 #define OBJ_COLORED 0x1000 /* pg_color is defined */ #define OBJ_ONEMAPPING 0x2000 /* One USE (a single, non-forked) mapping flag */ #define OBJ_DISCONNECTWNT 0x4000 /* disconnect from vnode wanted */