svn commit: r314899 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Andrey V. Elsukov]

Author: ae
Date: Wed Mar  8 07:59:45 2017
New Revision: 314899
URL: https://svnweb.freebsd.org/changeset/base/314899

Log:
  MFC r314497:
    Do not invoke the resize event when previous provider's size was zero.
    This is similar to r303637 fix for geom_disk.

Modified:
  stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c	Wed Mar  8 07:58:29 2017	(r314898)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c	Wed Mar  8 07:59:45 2017	(r314899)
@@ -267,7 +267,16 @@ zvol_size_changed(zvol_state_t *zv, uint
 		if (pp == NULL)
 			return;
 		g_topology_lock();
-		g_resize_provider(pp, zv->zv_volsize);
+
+		/*
+		 * Do not invoke resize event when initial size was zero.
+		 * ZVOL initializes the size on first open, this is not
+		 * real resizing.
+		 */
+		if (pp->mediasize == 0)
+			pp->mediasize = zv->zv_volsize;
+		else
+			g_resize_provider(pp, zv->zv_volsize);
 		g_topology_unlock();
 	}
 #endif	/* illumos */