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

[Alexander Motin]

Author: mav
Date: Mon Apr 21 16:46:44 2014
New Revision: 264733
URL: http://svnweb.freebsd.org/changeset/base/264733

Log:
  MFC r264193:
  In addition to r264077, tell GEOM that we do support BIO_DELETE now.

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 21 16:42:15 2014	(r264732)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c	Mon Apr 21 16:46:44 2014	(r264733)
@@ -2343,6 +2343,9 @@ zvol_geom_start(struct bio *bp)
 		zvol_strategy(bp);
 		break;
 	case BIO_GETATTR:
+		if (g_handleattr_int(bp, "GEOM::candelete", 1))
+			return;
+		/* FALLTHROUGH */
 	default:
 		g_io_deliver(bp, EOPNOTSUPP);
 		break;