diff options
| author | pjd <pjd@FreeBSD.org> | 2007-04-08 10:29:14 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2007-04-08 10:29:14 +0000 |
| commit | dae6c835948c81d54d98af47c2f469fccd3ecf12 (patch) | |
| tree | f6529dca76be0ca0ac553645bdac5fe06c88de1a /sys/cddl | |
| parent | 313c37aa5055a87af1c3770f7c1ce353d22d6703 (diff) | |
| download | FreeBSD-src-dae6c835948c81d54d98af47c2f469fccd3ecf12.zip FreeBSD-src-dae6c835948c81d54d98af47c2f469fccd3ecf12.tar.gz | |
Take vnode pointer and hold it under znode lock, so we won't race with
zfs_reclaim(). This may or may not fix problem reported by kris, but it's
definiatelly better that way.
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c index d2806b9..58dede8 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c @@ -68,16 +68,17 @@ static void znode_pageout_func(dmu_buf_t *dbuf, void *user_ptr) { znode_t *zp = user_ptr; - vnode_t *vp = ZTOV(zp); + vnode_t *vp; mutex_enter(&zp->z_lock); + vp = ZTOV(zp); if (vp == NULL) { mutex_exit(&zp->z_lock); zfs_znode_free(zp); } else if (vp->v_count == 0) { ZTOV(zp) = NULL; - mutex_exit(&zp->z_lock); vhold(vp); + mutex_exit(&zp->z_lock); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread); vrecycle(vp, curthread); VOP_UNLOCK(vp, 0, curthread); |
