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

[Alexander Motin]

Author: mav
Date: Fri Oct  2 20:09:16 2015
New Revision: 288520
URL: https://svnweb.freebsd.org/changeset/base/288520

Log:
  MFC r279996 (by smh): Allow zvol_geom_worker to process BIO_DELETE's
  
  If zvol_geom_start is called with a BIO_DELETE from a thread which can
  sleep it queues it for later processing by the zvol_geom_worker. The
  zvol_geom_worker didn't have a delete case so would simply loose the bio
  hence preventing the original caller from every completing. In addition
  an other unknown types would suffer the same fate.
  
  Allow zvol_geom_worker to process BIO_DELETE's via zvol_strategy and
  return unsupported for all unknown bio types.

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	Fri Oct  2 20:07:03 2015	(r288519)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c	Fri Oct  2 20:09:16 2015	(r288520)
@@ -2776,8 +2776,12 @@ zvol_geom_worker(void *arg)
 			break;
 		case BIO_READ:
 		case BIO_WRITE:
+		case BIO_DELETE:
 			zvol_strategy(bp);
 			break;
+		default:
+			g_io_deliver(bp, EOPNOTSUPP);
+			break;
 		}
 	}
 }