svn commit: r260783 - stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Andriy Gapon
avg at FreeBSD.org
Thu Jan 16 17:58:23 UTC 2014
Author: avg
Date: Thu Jan 16 17:58:22 2014
New Revision: 260783
URL: http://svnweb.freebsd.org/changeset/base/260783
Log:
Revert r260780 "add zfs_bmap to aid vnode_pager_haspage"
I thought that I had to have that commit in this branch, but now I
decided to not bother.
This is a direct commit, obviously.
Modified:
stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/cddl/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Thu Jan 16 17:06:02 2014 (r260782)
+++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Thu Jan 16 17:58:22 2014 (r260783)
@@ -5737,30 +5737,6 @@ zfs_freebsd_getpages(ap)
}
static int
-zfs_freebsd_bmap(ap)
- struct vop_bmap_args /* {
- struct vnode *a_vp;
- daddr_t a_bn;
- struct bufobj **a_bop;
- daddr_t *a_bnp;
- int *a_runp;
- int *a_runb;
- } */ *ap;
-{
-
- if (ap->a_bop != NULL)
- *ap->a_bop = &ap->a_vp->v_bufobj;
- if (ap->a_bnp != NULL)
- *ap->a_bnp = ap->a_bn;
- if (ap->a_runp != NULL)
- *ap->a_runp = 0;
- if (ap->a_runb != NULL)
- *ap->a_runb = 0;
-
- return (0);
-}
-
-static int
zfs_freebsd_open(ap)
struct vop_open_args /* {
struct vnode *a_vp;
@@ -6810,7 +6786,7 @@ struct vop_vector zfs_vnodeops = {
.vop_remove = zfs_freebsd_remove,
.vop_rename = zfs_freebsd_rename,
.vop_pathconf = zfs_freebsd_pathconf,
- .vop_bmap = zfs_freebsd_bmap,
+ .vop_bmap = VOP_EOPNOTSUPP,
.vop_fid = zfs_freebsd_fid,
.vop_getextattr = zfs_getextattr,
.vop_deleteextattr = zfs_deleteextattr,
More information about the svn-src-stable-8
mailing list