From owner-cvs-src@FreeBSD.ORG  Sat Oct 22 18:46:38 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9BE4E16A41F;
	Sat, 22 Oct 2005 18:46:38 +0000 (GMT) (envelope-from alc@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 57F2343D45;
	Sat, 22 Oct 2005 18:46:38 +0000 (GMT) (envelope-from alc@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9MIkcxI025447;
	Sat, 22 Oct 2005 18:46:38 GMT (envelope-from alc@repoman.freebsd.org)
Received: (from alc@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9MIkcgY025446;
	Sat, 22 Oct 2005 18:46:38 GMT (envelope-from alc)
Message-Id: <200510221846.j9MIkcgY025446@repoman.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sat, 22 Oct 2005 18:46:38 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/vm vm_object.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Oct 2005 18:46:38 -0000

alc         2005-10-22 18:46:38 UTC

  FreeBSD src repository

  Modified files:
    sys/vm               vm_object.c 
  Log:
  Use of the ZERO_COPY_SOCKETS options can result in an unusual state that
  vm_object_backing_scan() was not written to handle.  Specifically, a wired
  page within a backing object that is shadowed by a page within the shadow
  object.  Handle this state by removing the wired page from the backing
  object.  The wired page will be freed by socow_iodone().
  
  Stop masking errors: If a page is being freed by vm_object_backing_scan(),
  assert that it is no longer mapped rather than quietly destroying any
  mappings.
  
  Tested by: Harald Schmalzbauer
  
  Revision  Changes    Path
  1.351     +12 -4     src/sys/vm/vm_object.c