From owner-svn-src-stable-7@FreeBSD.ORG Thu Jan 21 21:04:30 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 015A51065676; Thu, 21 Jan 2010 21:04:30 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E348A8FC22; Thu, 21 Jan 2010 21:04:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0LL4TIA045046; Thu, 21 Jan 2010 21:04:29 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0LL4Tfk045044; Thu, 21 Jan 2010 21:04:29 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201001212104.o0LL4Tfk045044@svn.freebsd.org> From: John Baldwin Date: Thu, 21 Jan 2010 21:04:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r202769 - stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jan 2010 21:04:30 -0000 Author: jhb Date: Thu Jan 21 21:04:29 2010 New Revision: 202769 URL: http://svn.freebsd.org/changeset/base/202769 Log: Revert part of the previous change that partially reverted an earlier MFC of 199156. Modified: stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Modified: stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c ============================================================================== --- stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Thu Jan 21 20:57:43 2010 (r202768) +++ stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Thu Jan 21 21:04:29 2010 (r202769) @@ -1520,7 +1520,6 @@ zfs_create_fs(objset_t *os, cred_t *cr, vnode.v_type = VDIR; vnode.v_data = rootzp; rootzp->z_vnode = &vnode; - VN_LOCK_ASHARE(vp); bzero(&zfsvfs, sizeof (zfsvfs_t));