From owner-svn-src-stable-8@FreeBSD.ORG Mon Nov 8 09:18:39 2010 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C576106566B; Mon, 8 Nov 2010 09:18:39 +0000 (UTC) (envelope-from avg@freebsd.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id B08D48FC18; Mon, 8 Nov 2010 09:18:37 +0000 (UTC) Received: from porto.topspin.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id LAA25673; Mon, 08 Nov 2010 11:18:36 +0200 (EET) (envelope-from avg@freebsd.org) Received: from localhost.topspin.kiev.ua ([127.0.0.1]) by porto.topspin.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1PFNs4-0003iK-2i; Mon, 08 Nov 2010 11:18:36 +0200 Message-ID: <4CD7C06B.1090505@freebsd.org> Date: Mon, 08 Nov 2010 11:18:35 +0200 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.2.12) Gecko/20101029 Lightning/1.0b2 Thunderbird/3.1.6 MIME-Version: 1.0 To: Andriy Gapon References: <201011071932.oA7JW3BY072220@svn.freebsd.org> In-Reply-To: <201011071932.oA7JW3BY072220@svn.freebsd.org> X-Enigmail-Version: 1.1.2 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r214941 - stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 08 Nov 2010 09:18:39 -0000 on 07/11/2010 21:32 Andriy Gapon said the following: > Author: avg > Date: Sun Nov 7 19:32:03 2010 > New Revision: 214941 > URL: http://svn.freebsd.org/changeset/base/214941 > > Log: > Followup to r214936: zfs_getpages: account for differences from head > in page locking Reported by: jhell@DataIX.net Report overlooked by: 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 Nov 7 19:23:25 2010 (r214940) > +++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Sun Nov 7 19:32:03 2010 (r214941) > @@ -4181,14 +4181,13 @@ zfs_getpages(struct vnode *vp, vm_page_t > KASSERT(vp->v_object == object, ("mismatching object")); > > VM_OBJECT_LOCK(object); > - > + vm_page_lock_queues(); > for (i = 0; i < pcount; i++) { > if (i != reqpage) { > - vm_page_lock(m[i]); > vm_page_free(m[i]); > - vm_page_unlock(m[i]); > } > } > + vm_page_unlock_queues(); > > if (mreq->valid) { > if (mreq->valid != VM_PAGE_BITS_ALL) -- Andriy Gapon