From owner-svn-src-user@FreeBSD.ORG Fri Jul 12 21:27:23 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id ED68B2F7; Fri, 12 Jul 2013 21:27:23 +0000 (UTC) (envelope-from attilio@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 DDDB01016; Fri, 12 Jul 2013 21:27:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6CLRNuZ054242; Fri, 12 Jul 2013 21:27:23 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6CLRNiI054241; Fri, 12 Jul 2013 21:27:23 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201307122127.r6CLRNiI054241@svn.freebsd.org> From: Attilio Rao Date: Fri, 12 Jul 2013 21:27:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r253287 - user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Jul 2013 21:27:24 -0000 Author: attilio Date: Fri Jul 12 21:27:23 2013 New Revision: 253287 URL: http://svnweb.freebsd.org/changeset/base/253287 Log: Style. Sponsored by: EMC / Isilon storage division Modified: user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Modified: user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Fri Jul 12 21:24:10 2013 (r253286) +++ user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Fri Jul 12 21:27:23 2013 (r253287) @@ -511,7 +511,8 @@ mappedread_sf(vnode_t *vp, int nbytes, u vm_page_busy_runlock(pp); vm_page_lock(pp); if (error) { - if (pp->wire_count == 0 && pp->valid == 0 && !vm_page_busy_locked(pp)) + if (pp->wire_count == 0 && pp->valid == 0 && + !vm_page_busy_locked(pp)) vm_page_free(pp); } else { pp->valid = VM_PAGE_BITS_ALL;