Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

remove references to Nutanix from identifiers 

Now the only reference left is the special pool name.
That whole concept is going to replaced by zpool properties
in the future.
This commit is contained in:
Christian Schwarz 2022-10-24 12:54:14 +00:00
parent e6504443f9
commit 95e0c3a551
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/zpool/zpool_main.c
View File

@ -2437,8 +2437,8 @@ print_status_config(zpool_handle_t *zhp, status_cbdata_t *cb, const char *name,
(void) printf(gettext("invalid label"));
break;
case VDEV_AUX_POOL_USES_NTNX_SHARED_L2ARC:
(void) printf(gettext("ignored in favor of cache devices in pool " NTNX_L2ARC_POOL_NAME));
case VDEV_AUX_POOL_USES_SHARED_L2ARC:
(void) printf(gettext("ignored in favor of cache devices in pool " ZFS_SHARED_L2ARC_POOL_NAME));
break;
default:
@ -2600,8 +2600,8 @@ print_import_config(status_cbdata_t *cb, const char *name, nvlist_t *nv,
(void) printf(gettext("invalid label"));
break;
case VDEV_AUX_POOL_USES_NTNX_SHARED_L2ARC:
(void) printf(gettext("ignored in favor of cache devices in pool " NTNX_L2ARC_POOL_NAME));
case VDEV_AUX_POOL_USES_SHARED_L2ARC:
(void) printf(gettext("ignored in favor of cache devices in pool " ZFS_SHARED_L2ARC_POOL_NAME));
break;
default:

2
include/sys/arc.h
View File

@ -328,7 +328,7 @@ void arc_fini(void);
* Level 2 ARC
*/
#define NTNX_L2ARC_POOL_NAME "NTNX-fsvm-local-l2arc"
#define ZFS_SHARED_L2ARC_POOL_NAME "NTNX-fsvm-local-l2arc"
void l2arc_add_vdev(spa_t *spa, vdev_t *vd);
void l2arc_remove_vdev(vdev_t *vd);
boolean_t l2arc_vdev_present(vdev_t *vd);

2
include/sys/fs/zfs.h
View File

@ -986,7 +986,7 @@ typedef enum vdev_aux {
VDEV_AUX_SPLIT_POOL, /* vdev was split off into another pool */
VDEV_AUX_BAD_ASHIFT, /* vdev ashift is invalid */
VDEV_AUX_EXTERNAL_PERSIST, /* persistent forced fault */
VDEV_AUX_POOL_USES_NTNX_SHARED_L2ARC,
VDEV_AUX_POOL_USES_SHARED_L2ARC,
VDEV_AUX_ACTIVE, /* vdev active on a different host */
VDEV_AUX_CHILDREN_OFFLINE, /* all children are offline */
VDEV_AUX_ASHIFT_TOO_BIG, /* vdev's min block size is too large */

8
module/zfs/arc.c
View File

@ -5928,7 +5928,7 @@ arc_read_l2arc_scl_l2arc_tryenter(vdev_t *l2arc_vdev)
/* we only use l2arc vdevs from the dedicated L2ARC pool */
ASSERT(l2arc_vdev->vdev_spa);
ASSERT(strcmp(spa_name(l2arc_vdev->vdev_spa), NTNX_L2ARC_POOL_NAME) == 0);
ASSERT(strcmp(spa_name(l2arc_vdev->vdev_spa), ZFS_SHARED_L2ARC_POOL_NAME) == 0);
return spa_config_tryenter(l2arc_vdev->vdev_spa, SCL_L2ARC, l2arc_vdev, RW_READER);
}
@ -8967,7 +8967,7 @@ l2arc_read_done(zio_t *zio)
ASSERT3P(zio->io_vd, !=, NULL);
ASSERT(zio->io_flags & ZIO_FLAG_DONT_PROPAGATE);
ASSERT(strcmp(spa_name(zio->io_spa), NTNX_L2ARC_POOL_NAME) == 0);
ASSERT(strcmp(spa_name(zio->io_spa), ZFS_SHARED_L2ARC_POOL_NAME) == 0);
ASSERT3P(cb, !=, NULL);
hdr = cb->l2rcb_hdr;
@ -9981,7 +9981,7 @@ l2arc_feed_thread(void *unused)
* We only allow add l2arc devices in pool NTNX_L2ARC_POOL_NAME
* to l2arc_dev_list.
*/
ASSERT0(strcmp(spa_name(spa), NTNX_L2ARC_POOL_NAME));
ASSERT0(strcmp(spa_name(spa), ZFS_SHARED_L2ARC_POOL_NAME));
/*
* If the pool is read-only then force the feed thread to
@ -10142,7 +10142,7 @@ l2arc_add_vdev(spa_t *spa, vdev_t *vd)
ASSERT(!l2arc_vdev_present(vd));
VERIFY(strcmp(spa_name(spa), NTNX_L2ARC_POOL_NAME) == 0);
VERIFY(strcmp(spa_name(spa), ZFS_SHARED_L2ARC_POOL_NAME) == 0);
/*
* Create a new l2arc device entry.

6
module/zfs/spa.c
View File

@ -1978,11 +1978,11 @@ spa_load_l2cache(spa_t *spa)
(void) vdev_validate_aux(vd);
if (!vdev_is_dead(vd) &&
strcmp(spa_name(spa), NTNX_L2ARC_POOL_NAME) != 0) {
cmn_err(CE_WARN, "pool '%s': l2arc devices outside of pool " NTNX_L2ARC_POOL_NAME " will not be used and marked offline.", spa_name(spa));
strcmp(spa_name(spa), ZFS_SHARED_L2ARC_POOL_NAME) != 0) {
cmn_err(CE_WARN, "pool '%s': l2arc devices outside of pool " ZFS_SHARED_L2ARC_POOL_NAME " will not be used and marked offline.", spa_name(spa));
/* mark device as dead */
vdev_set_state(vd, B_TRUE, VDEV_STATE_UNUSED,
VDEV_AUX_POOL_USES_NTNX_SHARED_L2ARC);
VDEV_AUX_POOL_USES_SHARED_L2ARC);
/*
* Ensure that vdev_is_dead() returns true, so
* we don't l2arc_add_vdev below. The whole