d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If z_buf is NULL, we should free znode immediately.

Browse Source 
Noticed by:	avg
Approved by:	re (kib)
This commit is contained in:
pjd 2009-08-17 09:25:37 +00:00
parent f46807b28d
commit 6375a7d10d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
View File

@ -4350,7 +4350,6 @@ zfs_freebsd_reclaim(ap)
{
vnode_t *vp = ap->a_vp;
znode_t *zp = VTOZ(vp);
zfsvfs_t *zfsvfs;
ASSERT(zp != NULL);
@ -4360,13 +4359,18 @@ zfs_freebsd_reclaim(ap)
vnode_destroy_vobject(vp);
mutex_enter(&zp->z_lock);
ASSERT(zp->z_phys);
ASSERT(zp->z_phys != NULL);
ZTOV(zp) = NULL;
if (!zp->z_unlinked) {
mutex_exit(&zp->z_lock);
if (zp->z_unlinked)
; /* Do nothing. */
else if (zp->z_dbuf == NULL)
zfs_znode_free(zp);
else /* if (!zp->z_unlinked && zp->z_dbuf != NULL) */ {
zfsvfs_t *zfsvfs = zp->z_zfsvfs;
int locked;
zfsvfs = zp->z_zfsvfs;
mutex_exit(&zp->z_lock);
locked = MUTEX_HELD(ZFS_OBJ_MUTEX(zfsvfs, zp->z_id)) ? 2 :
ZFS_OBJ_HOLD_TRYENTER(zfsvfs, zp->z_id);
if (locked == 0) {
@ -4382,8 +4386,6 @@ zfs_freebsd_reclaim(ap)
ZFS_OBJ_HOLD_EXIT(zfsvfs, zp->z_id);
zfs_znode_free(zp);
}
} else {
mutex_exit(&zp->z_lock);
}
VI_LOCK(vp);
vp->v_data = NULL;