Module Name: src
Committed By: hannken
Date: Tue Feb 5 09:50:18 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_vnops.c
Log Message:
zfs_netbsd_reclaim(): validate "z_log" before zil_commit().
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.42 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.43
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.42 Sat Jan 5 09:20:29 2019
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Tue Feb 5 09:50:18 2019
@@ -5680,7 +5680,8 @@ zfs_netbsd_reclaim(void *v)
}
}
- zil_commit(zfsvfs->z_log, zp->z_id);
+ if (zfsvfs->z_log)
+ zil_commit(zfsvfs->z_log, zp->z_id);
if (zp->z_sa_hdl == NULL)
zfs_znode_free(zp);
