diff options
author | Andy Fiddaman <omnios@citrus-it.co.uk> | 2022-03-28 11:18:05 +0000 |
---|---|---|
committer | Andy Fiddaman <omnios@citrus-it.co.uk> | 2022-04-05 10:42:42 +0000 |
commit | f7457249d2a760edca827e174adb0db578a87784 (patch) | |
tree | 4903f3e9de7ba3a5e0d694b62b24fbe7e63e8257 | |
parent | 2af7a84a44750559d578033163c65829ae91c171 (diff) | |
download | illumos-joyent-f7457249d2a760edca827e174adb0db578a87784.tar.gz |
14595 sd DLE events should cover the first two partitions
Reviewed by: Jason King <jason.brian.king+illumos@gmail.com>
Reviewed by: Yuri Pankov <ypankov@tintri.com>
Approved by: Robert Mustacchi <rm@fingolfin.org>
-rw-r--r-- | usr/src/uts/common/io/blkdev/blkdev.c | 3 | ||||
-rw-r--r-- | usr/src/uts/common/io/scsi/targets/sd.c | 48 |
2 files changed, 29 insertions, 22 deletions
diff --git a/usr/src/uts/common/io/blkdev/blkdev.c b/usr/src/uts/common/io/blkdev/blkdev.c index 611666b0a1..847c7c58fc 100644 --- a/usr/src/uts/common/io/blkdev/blkdev.c +++ b/usr/src/uts/common/io/blkdev/blkdev.c @@ -1959,8 +1959,7 @@ bd_dle_sysevent_task(void *arg) * active zpools for child vdevs matching this physical path. * In order to catch both whole disk pools and those with an * EFI boot partition, generate separate sysevents for minor - * node 'a' and 'b'. (By comparison, io/scsi/targets/sd.c sends - * events for just 'a') + * node 'a' and 'b'. */ for (char c = 'a'; c < 'c'; c++) { path[n - 1] = c; diff --git a/usr/src/uts/common/io/scsi/targets/sd.c b/usr/src/uts/common/io/scsi/targets/sd.c index 4bf5a8e9f3..982e360f48 100644 --- a/usr/src/uts/common/io/scsi/targets/sd.c +++ b/usr/src/uts/common/io/scsi/targets/sd.c @@ -29,6 +29,7 @@ * Copyright 2019 Joyent, Inc. * Copyright 2017 Nexenta Systems, Inc. * Copyright 2019 Racktop Systems + * Copyright 2022 OmniOS Community Edition (OmniOSce) Association. */ /* * Copyright 2011 cyril.galibern@opensvc.com @@ -19745,6 +19746,7 @@ sd_log_dev_status_event(struct sd_lun *un, char *esc, int km_flag) int err; char *path; nvlist_t *attr_list; + size_t n; /* Allocate and build sysevent attribute list */ err = nvlist_alloc(&attr_list, NV_UNIQUE_NAME_TYPE, km_flag); @@ -19761,30 +19763,36 @@ sd_log_dev_status_event(struct sd_lun *un, char *esc, int km_flag) "sd_log_dev_status_event: fail to allocate space\n"); return; } + + n = snprintf(path, MAXPATHLEN, "/devices"); + (void) ddi_pathname(SD_DEVINFO(un), path + n); + n = strlen(path); + n += snprintf(path + n, MAXPATHLEN - n, ":x"); + /* - * Add path attribute to identify the lun. - * We are using minor node 'a' as the sysevent attribute. + * On receipt of this event, the ZFS sysevent module will scan + * active zpools for child vdevs matching this physical path. + * In order to catch both whole disk pools and those with an + * EFI boot partition, generate separate sysevents for minor + * node 'a' and 'b'. */ - (void) snprintf(path, MAXPATHLEN, "/devices"); - (void) ddi_pathname(SD_DEVINFO(un), path + strlen(path)); - (void) snprintf(path + strlen(path), MAXPATHLEN - strlen(path), - ":a"); + for (char c = 'a'; c < 'c'; c++) { + path[n - 1] = c; - err = nvlist_add_string(attr_list, DEV_PHYS_PATH, path); - if (err != 0) { - nvlist_free(attr_list); - kmem_free(path, MAXPATHLEN); - SD_ERROR(SD_LOG_ERROR, un, - "sd_log_dev_status_event: fail to add attribute\n"); - return; - } + err = nvlist_add_string(attr_list, DEV_PHYS_PATH, path); + if (err != 0) { + SD_ERROR(SD_LOG_ERROR, un, + "sd_log_dev_status_event: fail to add attribute\n"); + break; + } - /* Log dynamic lun expansion sysevent */ - err = ddi_log_sysevent(SD_DEVINFO(un), SUNW_VENDOR, EC_DEV_STATUS, - esc, attr_list, NULL, km_flag); - if (err != DDI_SUCCESS) { - SD_ERROR(SD_LOG_ERROR, un, - "sd_log_dev_status_event: fail to log sysevent\n"); + err = ddi_log_sysevent(SD_DEVINFO(un), SUNW_VENDOR, + EC_DEV_STATUS, esc, attr_list, NULL, km_flag); + if (err != DDI_SUCCESS) { + SD_ERROR(SD_LOG_ERROR, un, + "sd_log_dev_status_event: fail to log sysevent\n"); + break; + } } nvlist_free(attr_list); |