diff options
| author | Marcelo Araujo <araujo@FreeBSD.org> | 2018-05-10 03:50:20 +0000 |
|---|---|---|
| committer | Marcelo Araujo <araujo@FreeBSD.org> | 2018-05-10 03:50:20 +0000 |
| commit | 8951f05525ee4e9a93cc568dccd154405aae7419 (patch) | |
| tree | 503e8ca76afeb0231224fd5f2522663ca24ca5f6 /sys/cam/ctl/ctl_tpc.c | |
| parent | 3429b518c9bfbce5a16d76949d75a843567ba2de (diff) | |
Notes
Diffstat (limited to 'sys/cam/ctl/ctl_tpc.c')
| -rw-r--r-- | sys/cam/ctl/ctl_tpc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/cam/ctl/ctl_tpc.c b/sys/cam/ctl/ctl_tpc.c index 572d93a90078f..00fb3a52b3d4a 100644 --- a/sys/cam/ctl/ctl_tpc.c +++ b/sys/cam/ctl/ctl_tpc.c @@ -41,6 +41,8 @@ __FBSDID("$FreeBSD$"); #include <sys/conf.h> #include <sys/queue.h> #include <sys/sysctl.h> +#include <sys/nv.h> +#include <sys/dnv.h> #include <machine/atomic.h> #include <cam/cam.h> @@ -1668,7 +1670,7 @@ ctl_extended_copy_lid1(struct ctl_scsiio *ctsio) struct scsi_ec_segment *seg; struct tpc_list *list, *tlist; uint8_t *ptr; - char *value; + const char *value; int len, off, lencscd, lenseg, leninl, nseg; CTL_DEBUG_PRINT(("ctl_extended_copy_lid1\n")); @@ -1731,7 +1733,7 @@ ctl_extended_copy_lid1(struct ctl_scsiio *ctsio) list = malloc(sizeof(struct tpc_list), M_CTL, M_WAITOK | M_ZERO); list->service_action = cdb->service_action; - value = ctl_get_opt(&lun->be_lun->options, "insecure_tpc"); + value = dnvlist_get_string(lun->be_lun->options, "insecure_tpc", NULL); if (value != NULL && strcmp(value, "on") == 0) list->init_port = -1; else @@ -1822,7 +1824,7 @@ ctl_extended_copy_lid4(struct ctl_scsiio *ctsio) struct scsi_ec_segment *seg; struct tpc_list *list, *tlist; uint8_t *ptr; - char *value; + const char *value; int len, off, lencscd, lenseg, leninl, nseg; CTL_DEBUG_PRINT(("ctl_extended_copy_lid4\n")); @@ -1885,7 +1887,7 @@ ctl_extended_copy_lid4(struct ctl_scsiio *ctsio) list = malloc(sizeof(struct tpc_list), M_CTL, M_WAITOK | M_ZERO); list->service_action = cdb->service_action; - value = ctl_get_opt(&lun->be_lun->options, "insecure_tpc"); + value = dnvlist_get_string(lun->be_lun->options, "insecure_tpc", NULL); if (value != NULL && strcmp(value, "on") == 0) list->init_port = -1; else |