Author: avg
Date: Fri Sep 13 14:03:39 2013
New Revision: 255517
URL: http://svnweb.freebsd.org/changeset/base/255517
Log:
MFC r254445,254711: zfs: inline and remove zfs_vnode_lock
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h
Fri Sep 13 13:53:47 2013 (r255516)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h
Fri Sep 13 14:03:39 2013 (r255517)
@@ -153,7 +153,6 @@ extern int zfs_set_version(zfsvfs_t *zfs
extern int zfsvfs_create(const char *name, zfsvfs_t **zfvp);
extern void zfsvfs_free(zfsvfs_t *zfsvfs);
extern int zfs_check_global_label(const char *dsname, const char *hexsl);
-extern int zfs_vnode_lock(vnode_t *vp, int flags);
#ifdef _KERNEL
extern void zfsvfs_update_fromname(const char *oldname, const char *newname);
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
Fri Sep 13 13:53:47 2013 (r255516)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
Fri Sep 13 14:03:39 2013 (r255517)
@@ -1797,17 +1797,6 @@ zfs_statfs(vfs_t *vfsp, struct statfs *s
return (0);
}
-int
-zfs_vnode_lock(vnode_t *vp, int flags)
-{
- int error;
-
- ASSERT(vp != NULL);
-
- error = vn_lock(vp, flags);
- return (error);
-}
-
static int
zfs_root(vfs_t *vfsp, int flags, vnode_t **vpp)
{
@@ -1824,7 +1813,7 @@ zfs_root(vfs_t *vfsp, int flags, vnode_t
ZFS_EXIT(zfsvfs);
if (error == 0) {
- error = zfs_vnode_lock(*vpp, flags);
+ error = vn_lock(*vpp, flags);
if (error == 0)
(*vpp)->v_vflag |= VV_ROOT;
}
@@ -2083,7 +2072,7 @@ zfs_vget(vfs_t *vfsp, ino_t ino, int fla
*vpp = ZTOV(zp);
ZFS_EXIT(zfsvfs);
if (err == 0)
- err = zfs_vnode_lock(*vpp, flags);
+ err = vn_lock(*vpp, flags);
if (err != 0)
*vpp = NULL;
else
@@ -2182,7 +2171,7 @@ zfs_fhtovp(vfs_t *vfsp, fid_t *fidp, int
VN_HOLD(*vpp);
}
ZFS_EXIT(zfsvfs);
- err = zfs_vnode_lock(*vpp, flags);
+ err = vn_lock(*vpp, flags);
if (err != 0)
*vpp = NULL;
return (err);
@@ -2209,7 +2198,7 @@ zfs_fhtovp(vfs_t *vfsp, fid_t *fidp, int
*vpp = ZTOV(zp);
ZFS_EXIT(zfsvfs);
- err = zfs_vnode_lock(*vpp, flags | LK_RETRY);
+ err = vn_lock(*vpp, flags | LK_RETRY);
if (err == 0)
vnode_create_vobject(*vpp, zp->z_size, curthread);
else
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Fri Sep
13 13:53:47 2013 (r255516)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Fri Sep
13 14:03:39 2013 (r255517)
@@ -1520,7 +1520,7 @@ zfs_lookup(vnode_t *dvp, char *nm, vnode
VOP_UNLOCK(dvp, 0);
}
ZFS_EXIT(zfsvfs);
- error = zfs_vnode_lock(*vpp, cnp->cn_lkflags);
+ error = vn_lock(*vpp, cnp->cn_lkflags);
if (cnp->cn_flags & ISDOTDOT)
vn_lock(dvp, ltype | LK_RETRY);
if (error != 0) {
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"
