Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove refences to blacklist/whitelist #10457

Merged
merged 1 commit into from
Jun 16, 2020
Merged

remove refences to blacklist/whitelist #10457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/zpool/zpool_iter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ for_each_vdev_run_cb(zpool_handle_t *zhp, nvlist_t *nv, void *cb_vcdl)
}
}

/* Check for whitelisted vdevs here, if any */
/* Check for selected vdevs here, if any */
for (i = 0; i < vcdl->vdev_names_count; i++) {
vname = zpool_vdev_name(g_zfs, zhp, nv, vcdl->cb_name_flags);
if (strcmp(vcdl->vdev_names[i], vname) == 0) {
Expand All @@ -627,7 +627,7 @@ for_each_vdev_run_cb(zpool_handle_t *zhp, nvlist_t *nv, void *cb_vcdl)
free(vname);
}

/* If we whitelisted vdevs, and this isn't one of them, then bail out */
/* If we selected vdevs, and this isn't one of them, then bail out */
if (!match && vcdl->vdev_names_count)
return (0);

Expand Down
2 changes: 1 addition & 1 deletion cmd/zpool/zpool_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ typedef struct vdev_cmd_data_list
char *cmd; /* Command to run */
unsigned int count; /* Number of vdev_cmd_data items (vdevs) */

/* vars to whitelist only certain vdevs, if requested */
/* fields used to select only certain vdevs, if requested */
libzfs_handle_t *g_zfs;
char **vdev_names;
int vdev_names_count;
Expand Down
20 changes: 10 additions & 10 deletions lib/libzutil/os/freebsd/zutil_import_os.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ update_vdev_config_dev_strs(nvlist_t *nv)
/*
* Do not even look at these devices.
*/
static const char * const blacklist_devs[] = {
static const char * const excluded_devs[] = {
"nfslock",
"sequencer",
"zfs",
};
#define BLACKLIST_DIR "/dev/"
#define BLACKLIST_DIR_LEN 5
#define EXCLUDED_DIR "/dev/"
#define EXCLUDED_DIR_LEN 5

void
zpool_open_func(void *arg)
Expand All @@ -108,14 +108,14 @@ zpool_open_func(void *arg)
off_t mediasize = 0;

/*
* Do not even look at blacklisted devices.
* Do not even look at excluded devices.
*/
if (strncmp(rn->rn_name, BLACKLIST_DIR, BLACKLIST_DIR_LEN) == 0) {
char *name = rn->rn_name + BLACKLIST_DIR_LEN;
for (i = 0; i < nitems(blacklist_devs); ++i) {
const char *badname = blacklist_devs[i];
size_t len = strlen(badname);
if (strncmp(name, badname, len) == 0) {
if (strncmp(rn->rn_name, EXCLUDED_DIR, EXCLUDED_DIR_LEN) == 0) {
char *name = rn->rn_name + EXCLUDED_DIR_LEN;
for (i = 0; i < nitems(excluded_devs); ++i) {
const char *excluded_name = excluded_devs[i];
size_t len = strlen(excluded_name);
if (strncmp(name, excluded_name, len) == 0) {
return;
}
}
Expand Down