From owner-svn-src-stable-8@FreeBSD.ORG Sun Mar 31 20:40:06 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D6803C36; Sun, 31 Mar 2013 20:40:06 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C7856E4B; Sun, 31 Mar 2013 20:40:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2VKe6do081814; Sun, 31 Mar 2013 20:40:06 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2VKe6Am081813; Sun, 31 Mar 2013 20:40:06 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201303312040.r2VKe6Am081813@svn.freebsd.org> From: Andriy Gapon Date: Sun, 31 Mar 2013 20:40:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r248960 - stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Mar 2013 20:40:06 -0000 Author: avg Date: Sun Mar 31 20:40:06 2013 New Revision: 248960 URL: http://svnweb.freebsd.org/changeset/base/248960 Log: fix r248946: there is no pmap_page_is_write_mapped in stable/8 This is a direct commit. Pointyhat to: avg Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Sun Mar 31 19:03:25 2013 (r248959) +++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Sun Mar 31 20:40:06 2013 (r248960) @@ -450,7 +450,7 @@ update_pages(vnode_t *vp, int64_t start, ("zfs update_pages: invalid page in putpages case")); KASSERT(pp->busy > 0, ("zfs update_pages: unbusy page in putpages case")); - KASSERT(!pmap_page_is_write_mapped(pp), + KASSERT((pp->flags & PG_WRITEABLE) == 0, ("zfs update_pages: writable page in putpages case")); VM_OBJECT_UNLOCK(obj);