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

[Alexander Motin]

Author: mav
Date: Wed Mar 30 16:54:18 2016
New Revision: 297421
URL: https://svnweb.freebsd.org/changeset/base/297421

Log:
  Plug open count leak on zvol rename.
  
  MFC after:	2 weeks

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

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c	Wed Mar 30 16:48:57 2016	(r297420)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c	Wed Mar 30 16:54:18 2016	(r297421)
@@ -2977,6 +2977,11 @@ zvol_rename_minor(zvol_state_t *zv, cons
 		ASSERT(dev != NULL);
 		zv->zv_dev = NULL;
 		destroy_dev(dev);
+		if (zv->zv_total_opens > 0) {
+			zv->zv_flags &= ~ZVOL_EXCL;
+			zv->zv_total_opens = 0;
+			zvol_last_close(zv);
+		}
 
 		make_dev_args_init(&args);
 		args.mda_flags = MAKEDEV_CHECKNAME | MAKEDEV_WAITOK;