From owner-svn-src-stable@FreeBSD.ORG Tue Jan 17 06:57:55 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE222106566C; Tue, 17 Jan 2012 06:57:55 +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 D79B48FC12; Tue, 17 Jan 2012 06:57:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0H6vt2n072043; Tue, 17 Jan 2012 06:57:55 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0H6vtwX072041; Tue, 17 Jan 2012 06:57:55 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201201170657.q0H6vtwX072041@svn.freebsd.org> From: Konstantin Belousov Date: Tue, 17 Jan 2012 06:57:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r230258 - stable/9/sys/vm X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jan 2012 06:57:56 -0000 Author: kib Date: Tue Jan 17 06:57:55 2012 New Revision: 230258 URL: http://svn.freebsd.org/changeset/base/230258 Log: MFC r229934: Change the type of the paging_in_progress refcounter from u_short to u_int. With the auto-sized buffer cache on the modern machines, UFS metadata can generate more the 65535 pages belonging to the buffers undergoing i/o, overflowing the counter. To keep the layout of other fields of the struct vm_object intact on stable/9, put enlarged paging_in_progress at the end of the structure, and put a placeholder in the place of old pip counter. Modified: stable/9/sys/vm/vm_object.h Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/vm/vm_object.h ============================================================================== --- stable/9/sys/vm/vm_object.h Tue Jan 17 06:40:41 2012 (r230257) +++ stable/9/sys/vm/vm_object.h Tue Jan 17 06:57:55 2012 (r230258) @@ -96,7 +96,7 @@ struct vm_object { objtype_t type; /* type of pager */ u_short flags; /* see below */ u_short pg_color; /* (c) color of first page in obj */ - u_short paging_in_progress; /* Paging (in or out) so don't collapse or destroy */ + u_short pad1; /* Old pip counter */ int resident_page_count; /* number of resident pages */ struct vm_object *backing_object; /* object that I'm a shadow of */ vm_ooffset_t backing_object_offset;/* Offset in backing object */ @@ -146,6 +146,7 @@ struct vm_object { } un_pager; struct ucred *cred; vm_ooffset_t charge; + u_int paging_in_progress; /* Paging (in or out) so don't collapse or destroy */ }; /*