svn commit: r297546 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Alexander Motin]

Author: mav
Date: Mon Apr  4 09:47:39 2016
New Revision: 297546
URL: https://svnweb.freebsd.org/changeset/base/297546

Log:
  MFC r297232: Unify ignoring EEXIST from zvol_create_minor().
  
  This fixes creation of zvol devices for snapshots during zfs receive,
  that previously failed with "ZFS WARNING: Unable to create ZVOL" message.
  This solution is not perfect, but IMHO better then it was before.

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

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c	Mon Apr  4 09:41:22 2016	(r297545)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c	Mon Apr  4 09:47:39 2016	(r297546)
@@ -2841,7 +2841,8 @@ zvol_create_snapshots(objset_t *os, cons
 			break;
 		}
 
-		if ((error = zvol_create_minor(sname)) != 0) {
+		error = zvol_create_minor(sname);
+		if (error != 0 && error != EEXIST) {
 			printf("ZFS WARNING: Unable to create ZVOL %s (error=%d).\n",
 			    sname, error);
 			break;