From owner-svn-src-user@FreeBSD.ORG Mon Nov 23 01:53:27 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id CBD3F1065672;
Mon, 23 Nov 2009 01:53:27 +0000 (UTC)
(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id B50BD8FC1B;
Mon, 23 Nov 2009 01:53:27 +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 nAN1rRbt036058;
Mon, 23 Nov 2009 01:53:27 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAN1rRtm036056;
Mon, 23 Nov 2009 01:53:27 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200911230153.nAN1rRtm036056@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 23 Nov 2009 01:53:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r199686 -
user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Nov 2009 01:53:27 -0000
Author: kmacy
Date: Mon Nov 23 01:53:27 2009
New Revision: 199686
URL: http://svn.freebsd.org/changeset/base/199686
Log:
set vnode type so that vm object creation will succeed
Modified:
user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
Modified: user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
==============================================================================
--- user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c Mon Nov 23 01:23:03 2009 (r199685)
+++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c Mon Nov 23 01:53:27 2009 (r199686)
@@ -1070,13 +1070,17 @@ vdev_open(vdev_t *vd)
struct vnode *vp;
error = getnewvnode("zpool" , NULL, &dead_vnodeops, &vp);
+ KASSERT(error == 0, ("unhandled error in vdev_open"));
if (error != 0)
return (error);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+ vp->v_type = VREG;
vnode_create_vobject(vp, 512, curthread);
vd->vdev_vnode = vp;
VOP_UNLOCK(vp, 0);
+ KASSERT(vp->v_object != NULL, ("vnode_create_vobject failed"));
+
}
/*
* If a leaf vdev has a DTL, and seems healthy, then kick off a