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

[Andriy Gapon]

Author: avg
Date: Sun Nov  4 14:43:15 2012
New Revision: 242574
URL: http://svn.freebsd.org/changeset/base/242574

Log:
  zfsctl_snapdir_lookup: obtain a snapname in the remount case
  
  ... which is triggered if somebody did regular umount on a snapshot mount.
  
  Reviewed by:	Matthew Ahrens <mahrens at delphix.com>
  MFC after:	20 days

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

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c	Sun Nov  4 14:36:11 2012	(r242573)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c	Sun Nov  4 14:43:15 2012	(r242574)
@@ -1002,6 +1002,7 @@ zfsctl_snapdir_lookup(ap)
 			 * The snapshot was unmounted behind our backs,
 			 * try to remount it.
 			 */
+			VERIFY(zfsctl_snapshot_zname(dvp, nm, MAXNAMELEN, snapname) == 0);
 			goto domount;
 		} else {
 			/*