From owner-svn-src-user@FreeBSD.ORG  Thu Dec  3 02:19:13 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 94C741065692;
	Thu,  3 Dec 2009 02:19:13 +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 838B88FC1D;
	Thu,  3 Dec 2009 02:19:13 +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 nB32JDRF037765;
	Thu, 3 Dec 2009 02:19:13 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nB32JDH6037764;
	Thu, 3 Dec 2009 02:19:13 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200912030219.nB32JDH6037764@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Thu, 3 Dec 2009 02:19:13 +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: r200050 -
	user/kmacy/releng_8_fcs_buf_xen/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 &quot; user&quot;
	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: Thu, 03 Dec 2009 02:19:13 -0000

Author: kmacy
Date: Thu Dec  3 02:19:12 2009
New Revision: 200050
URL: http://svn.freebsd.org/changeset/base/200050

Log:
  - remove unused variables
  - break out zbio_getblk and zbio_data_getblk

Modified:
  user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_bio.c

Modified: user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_bio.c
==============================================================================
--- user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_bio.c	Thu Dec  3 00:27:16 2009	(r200049)
+++ user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_bio.c	Thu Dec  3 02:19:12 2009	(r200050)
@@ -59,29 +59,17 @@ SYSCTL_INT(_vfs_zfs, OID_AUTO, page_cach
 
 static eventhandler_tag zbio_event_shutdown = NULL;
 
-void
-zbio_data_getblk(arc_buf_t *buf)
-{
-
-	zbio_getblk(buf);
-}
-
-void
-zbio_getblk(arc_buf_t *buf)
+static void
+_zbio_getblk(arc_buf_t *buf, int flags)
 {
 	zbio_buf_hdr_t		*hdr = (zbio_buf_hdr_t *)buf->b_hdr;
 	uint64_t		size = hdr->b_size;
-	arc_buf_contents_t	type = hdr->b_type;
 	spa_t			*spa = hdr->b_spa;
 	uint64_t blkno = hdr->b_dva.dva_word[1] & ~(1ULL<<63);
 	void *data;
-	arc_buf_t *tbuf;
 	struct vnode *vp;
-	int i, flags = 0;
 	struct buf *newbp;
 	struct bufobj *bo;
-	vm_pindex_t start, end;
-	vm_object_t object;
 
 	vp = spa_get_vnode(spa);
 	bo = &vp->v_bufobj;
@@ -115,6 +103,20 @@ zbio_getblk(arc_buf_t *buf)
 }
 
 void
+zbio_getblk(arc_buf_t *buf)
+{
+
+	_zbio_getblk(buf, 0);
+}
+
+void
+zbio_data_getblk(arc_buf_t *buf)
+{
+
+	_zbio_getblk(buf, GB_NODUMP);
+}
+
+void
 zbio_relse(arc_buf_t *buf, size_t size)
 {
 	struct buf *bp = buf->b_bp;