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

[Cy Schubert]

Thank you.

---
Sent using a tiny phone keyboard.
Apologies for any typos and autocorrect.
Also, this old phone only supports top post. Apologies.

Cy Schubert
<Cy.Schubert at cschubert.com> or <cy at freebsd.org>
The need of the many outweighs the greed of the few.
---

-----Original Message-----
From: Mateusz Guzik
Sent: 14/10/2018 10:14
To: src-committers at freebsd.org; svn-src-all at freebsd.org; svn-src-head at freebsd.org
Subject: svn commit: r339355 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

Author: mjg
Date: Sun Oct 14 16:14:01 2018
New Revision: 339355
URL: https://svnweb.freebsd.org/changeset/base/339355

Log:
  zfs: fix a panic after failed mount
  
  r338927("zfs: depessimize zfs_root with rmlocks") failed to error check
  the mount before caching root vnode.
  
  Results in crashes in rrw_enter_read_impl tracing back to zfs_mount.
  
  Reported by:	Mike Tancsa
  Tested by:	allanjude
  Approved by:	re (kib)

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

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	Sun Oct 14 05:09:43 2018	(r339354)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	Sun Oct 14 16:14:01 2018	(r339355)
@@ -1929,7 +1929,8 @@ zfs_mount(vfs_t *vfsp)
 	error = zfs_domount(vfsp, osname);
 	PICKUP_GIANT();
 
-	zfs_root_setvnode((zfsvfs_t *)vfsp->vfs_data);
+	if (error == 0)
+		zfs_root_setvnode((zfsvfs_t *)vfsp->vfs_data);
 
 #ifdef illumos
 	/*