svn commit: r354385 - vendor-sys/illumos/dist/uts/common/fs/zfs

[Andriy Gapon]

Author: avg
Date: Wed Nov  6 09:05:39 2019
New Revision: 354385
URL: https://svnweb.freebsd.org/changeset/base/354385

Log:
  11541 allocation_classes feature must be enabled to add log device
  
  illumos/illumos-gate at c1064fd7ce62fe763a4475e9988ffea3b22137de
  https://github.com/illumos/illumos-gate/commit/c1064fd7ce62fe763a4475e9988ffea3b22137de
  
  https://www.illumos.org/issues/11541
    After the allocation_classes feature was integrated, one can no longer add a
    log device to a pool unless that feature is enabled. There is an explicit check
    for this, but it is unnecessary in the case of log devices, so we should handle
    this better instead of forcing the feature to be enabled.
  
  Author: Jerry Jelinek <jerry.jelinek at joyent.com>

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c	Wed Nov  6 09:04:19 2019	(r354384)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c	Wed Nov  6 09:05:39 2019	(r354385)
@@ -25,7 +25,7 @@
  * Copyright 2017 Nexenta Systems, Inc.
  * Copyright (c) 2014 Integros [integros.com]
  * Copyright 2016 Toomas Soome <tsoome at me.com>
- * Copyright 2017 Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  * Copyright (c) 2017, Intel Corporation.
  */
 
@@ -633,7 +633,8 @@ vdev_alloc(spa_t *spa, vdev_t **vdp, nvlist_t *nv, vde
 			alloc_bias = vdev_derive_alloc_bias(bias);
 
 			/* spa_vdev_add() expects feature to be enabled */
-			if (spa->spa_load_state != SPA_LOAD_CREATE &&
+			if (alloc_bias != VDEV_BIAS_LOG &&
+			    spa->spa_load_state != SPA_LOAD_CREATE &&
 			    !spa_feature_is_enabled(spa,
 			    SPA_FEATURE_ALLOCATION_CLASSES)) {
 				return (SET_ERROR(ENOTSUP));