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

zfs_rezget: z_vnode can not be NULL if zp is valid

Browse Source 
MFC after:	3 weeks
This commit is contained in:
Andriy Gapon 2016-04-16 07:41:56 +00:00
parent c2d36fc5cd
commit e01dd79f9a
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
View File

@ -1341,7 +1341,7 @@ zfs_rezget(znode_t *zp)
* recycled when the last vnode reference is dropped.
*/
vp = ZTOV(zp);
if (vp != NULL && vp->v_type != IFTOVT((mode_t)zp->z_mode)) {
if (vp->v_type != IFTOVT((mode_t)zp->z_mode)) {
zfs_znode_dmu_fini(zp);
ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num);
return (EIO);
@ -1349,11 +1349,9 @@ zfs_rezget(znode_t *zp)
zp->z_unlinked = (zp->z_links == 0);
zp->z_blksz = doi.doi_data_block_size;
if (vp != NULL) {
vn_pages_remove(vp, 0, 0);
if (zp->z_size != size)
vnode_pager_setsize(vp, zp->z_size);
}
vn_pages_remove(vp, 0, 0);
if (zp->z_size != size)
vnode_pager_setsize(vp, zp->z_size);
ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num);