summaryrefslogtreecommitdiffstats
path: root/sys/cam
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2015-10-05 11:29:23 +0000
committermav <mav@FreeBSD.org>2015-10-05 11:29:23 +0000
commitc019c6978215679df0e5954ea514dbe52fb17c8e (patch)
treeaf4438622ff3becdca62f6fcb29ab71a53e30eb4 /sys/cam
parent8ce1fb15dbc7fe5de06459ad84d1bb26b6a08885 (diff)
downloadFreeBSD-src-c019c6978215679df0e5954ea514dbe52fb17c8e.zip
FreeBSD-src-c019c6978215679df0e5954ea514dbe52fb17c8e.tar.gz
MFC r288264: Allow LOG SENSE command on non-disk devices.
Diffstat (limited to 'sys/cam')
-rw-r--r--sys/cam/ctl/ctl_cmd_table.c5
-rw-r--r--sys/cam/ctl/ctl_private.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/cam/ctl/ctl_cmd_table.c b/sys/cam/ctl/ctl_cmd_table.c
index a41ee9e..94b3b6e 100644
--- a/sys/cam/ctl/ctl_cmd_table.c
+++ b/sys/cam/ctl/ctl_cmd_table.c
@@ -866,7 +866,10 @@ const struct ctl_cmd_entry ctl_cmd_table[256] =
{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
/* 4D LOG SENSE */
-{ctl_log_sense, CTL_SERIDX_LOG_SNS, CTL_CMD_FLAG_OK_ON_SLUN |
+{ctl_log_sense, CTL_SERIDX_LOG_SNS, CTL_CMD_FLAG_OK_ON_BOTH |
+ CTL_CMD_FLAG_OK_ON_STOPPED |
+ CTL_CMD_FLAG_OK_ON_INOPERABLE |
+ CTL_CMD_FLAG_OK_ON_STANDBY |
CTL_FLAG_DATA_IN |
CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
CTL_LUN_PAT_NONE, 10, {0, 0xff, 0xff, 0, 0xff, 0xff, 0xff, 0xff, 0x07} },
diff --git a/sys/cam/ctl/ctl_private.h b/sys/cam/ctl/ctl_private.h
index bf48101..03b9787 100644
--- a/sys/cam/ctl/ctl_private.h
+++ b/sys/cam/ctl/ctl_private.h
@@ -306,7 +306,7 @@ static const struct ctl_page_index log_page_index_template[] = {
{SLS_SUPPORTED_PAGES_PAGE, SLS_SUPPORTED_SUBPAGES_SUBPAGE, 0, NULL,
CTL_PAGE_FLAG_NONE, NULL, NULL},
{SLS_LOGICAL_BLOCK_PROVISIONING, 0, 0, NULL,
- CTL_PAGE_FLAG_NONE, ctl_lbp_log_sense_handler, NULL},
+ CTL_PAGE_FLAG_DISK_ONLY, ctl_lbp_log_sense_handler, NULL},
{SLS_STAT_AND_PERF, 0, 0, NULL,
CTL_PAGE_FLAG_NONE, ctl_sap_log_sense_handler, NULL},
};
OpenPOWER on IntegriCloud