svn commit: r290466 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

Steven Hartland smh at FreeBSD.org
Fri Nov 6 20:45:20 UTC 2015


Author: smh
Date: Fri Nov  6 20:45:19 2015
New Revision: 290466
URL: https://svnweb.freebsd.org/changeset/base/290466

Log:
  Switch zfs_panic_recover to panic for bad DVA
  
  As reported by Coverity a null pointer de-reference panic would be triggered
  when zfs_recover was set so switch to straight panic as it can never be
  recovered.
  
  Reported by: Coverity Scan
  MFC after:	1
  X-MFC-With:	r290401
  Sponsored by:	Multiplay

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c	Fri Nov  6 20:12:31 2015	(r290465)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c	Fri Nov  6 20:45:19 2015	(r290466)
@@ -1838,7 +1838,7 @@ dva_get_dsize_sync(spa_t *spa, const dva
 		uint64_t vdev = DVA_GET_VDEV(dva);
 		vdev_t *vd = vdev_lookup_top(spa, vdev);
 		if (vd == NULL) {
-			zfs_panic_recover(
+			panic(
 			    "dva_get_dsize_sync(): bad DVA %llu:%llu",
 			    (u_longlong_t)vdev, (u_longlong_t)asize);
 		}


More information about the svn-src-all mailing list