svn commit: r200050 -
user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Kip Macy
kmacy at FreeBSD.org
Thu Dec 3 02:19:13 UTC 2009
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;
More information about the svn-src-user
mailing list