Author: avg
Date: Wed Jul 13 10:58:52 2016
New Revision: 302758
URL: https://svnweb.freebsd.org/changeset/base/302758
Log:
Partial MFC r273641: use FreeBSD reclaim for illumos inactive
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h
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/gfs.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c Wed Jul 13
10:49:32 2016 (r302757)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c Wed Jul 13
10:58:52 2016 (r302758)
@@ -90,7 +90,7 @@
* gfs_dir_lookup()
* gfs_dir_readdir()
*
- * gfs_vop_inactive()
+ * gfs_vop_reclaim()
* gfs_vop_lookup()
* gfs_vop_readdir()
* gfs_vop_map()
@@ -614,7 +614,7 @@ gfs_root_create_file(size_t size, vfs_t
/*
* gfs_file_inactive()
*
- * Called from the VOP_INACTIVE() routine. If necessary, this routine will
+ * Called from the VOP_RECLAIM() routine. If necessary, this routine will
* remove the given vnode from the parent directory and clean up any references
* in the VFS layer.
*
@@ -1213,15 +1213,15 @@ gfs_vop_map(vnode_t *vp, offset_t off, s
#endif /* sun */
/*
- * gfs_vop_inactive: VOP_INACTIVE() entry point
+ * gfs_vop_reclaim: VOP_RECLAIM() entry point (solaris' VOP_INACTIVE())
*
* Given a vnode that is a GFS file or directory, call gfs_file_inactive() or
* gfs_dir_inactive() as necessary, and kmem_free()s associated private data.
*/
/* ARGSUSED */
int
-gfs_vop_inactive(ap)
- struct vop_inactive_args /* {
+gfs_vop_reclaim(ap)
+ struct vop_reclaim_args /* {
struct vnode *a_vp;
struct thread *a_td;
} */ *ap;
@@ -1234,6 +1234,7 @@ gfs_vop_inactive(ap)
else
gfs_file_inactive(vp);
+ vnode_destroy_vobject(vp);
VI_LOCK(vp);
vp->v_data = NULL;
VI_UNLOCK(vp);
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
Wed Jul 13 10:49:32 2016 (r302757)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
Wed Jul 13 10:58:52 2016 (r302758)
@@ -645,8 +645,8 @@ static struct vop_vector zfsctl_ops_root
.vop_access = zfsctl_common_access,
.vop_readdir = gfs_vop_readdir,
.vop_lookup = zfsctl_freebsd_root_lookup,
- .vop_inactive = gfs_vop_inactive,
- .vop_reclaim = zfsctl_common_reclaim,
+ .vop_inactive = VOP_NULL,
+ .vop_reclaim = gfs_vop_reclaim,
#ifdef TODO
.vop_pathconf = zfsctl_pathconf,
#endif
@@ -699,7 +699,7 @@ zfsctl_unmount_snap(zfs_snapentry_t *sep
* the sd_lock mutex held by our caller.
*/
ASSERT(svp->v_count == 1);
- gfs_vop_inactive(svp, cr, NULL);
+ gfs_vop_reclaim(svp, cr, NULL);
kmem_free(sep->se_name, strlen(sep->se_name) + 1);
kmem_free(sep, sizeof (zfs_snapentry_t));
@@ -1451,8 +1451,8 @@ static struct vop_vector zfsctl_ops_shar
.vop_access = zfsctl_common_access,
.vop_readdir = zfsctl_shares_readdir,
.vop_lookup = zfsctl_shares_lookup,
- .vop_inactive = gfs_vop_inactive,
- .vop_reclaim = zfsctl_common_reclaim,
+ .vop_inactive = VOP_NULL,
+ .vop_reclaim = gfs_vop_reclaim,
.vop_fid = zfsctl_shares_fid,
};
#endif /* !sun */
@@ -1479,8 +1479,9 @@ zfsctl_snapshot_mknode(vnode_t *pvp, uin
return (vp);
}
+
static int
-zfsctl_snapshot_inactive(ap)
+zfsctl_snapshot_reclaim(ap)
struct vop_inactive_args /* {
struct vnode *a_vp;
struct thread *a_td;
@@ -1488,18 +1489,19 @@ zfsctl_snapshot_inactive(ap)
{
vnode_t *vp = ap->a_vp;
cred_t *cr = ap->a_td->td_ucred;
- struct vop_inactive_args iap;
+ struct vop_reclaim_args iap;
zfsctl_snapdir_t *sdp;
zfs_snapentry_t *sep, *next;
int locked;
vnode_t *dvp;
- if (vp->v_count > 0)
- goto end;
-
VERIFY(gfs_dir_lookup(vp, "..", &dvp, cr, 0, NULL, NULL) == 0);
sdp = dvp->v_data;
-
+ /* this may already have been unmounted */
+ if (sdp == NULL) {
+ VN_RELE(dvp);
+ return (0);
+ }
if (!(locked = MUTEX_HELD(&sdp->sd_lock)))
mutex_enter(&sdp->sd_lock);
@@ -1523,7 +1525,6 @@ zfsctl_snapshot_inactive(ap)
mutex_exit(&sdp->sd_lock);
VN_RELE(dvp);
-end:
/*
* Dispose of the vnode for the snapshot mount point.
* This is safe to do because once this entry has been removed
@@ -1532,7 +1533,9 @@ end:
* creating a new vnode.
*/
iap.a_vp = vp;
- return (gfs_vop_inactive(&iap));
+ gfs_vop_reclaim(&iap);
+ return (0);
+
}
static int
@@ -1583,8 +1586,8 @@ zfsctl_snapshot_vptocnp(struct vop_vptoc
*/
static struct vop_vector zfsctl_ops_snapshot = {
.vop_default = &default_vnodeops,
- .vop_inactive = zfsctl_snapshot_inactive,
- .vop_reclaim = zfsctl_common_reclaim,
+ .vop_inactive = VOP_NULL,
+ .vop_reclaim = zfsctl_snapshot_reclaim,
.vop_vptocnp = zfsctl_snapshot_vptocnp,
};
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h Wed Jul 13
10:49:32 2016 (r302757)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h Wed Jul 13
10:58:52 2016 (r302758)
@@ -149,7 +149,7 @@ extern int gfs_get_parent_ino(vnode_t *,
extern int gfs_lookup_dot(vnode_t **, vnode_t *, vnode_t *, const char *);
extern int gfs_vop_readdir(struct vop_readdir_args *);
-extern int gfs_vop_inactive(struct vop_inactive_args *);
+extern int gfs_vop_reclaim(struct vop_reclaim_args *);
#ifdef __cplusplus
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
