diff options
author | mav <mav@FreeBSD.org> | 2014-12-18 08:45:28 +0000 |
---|---|---|
committer | mav <mav@FreeBSD.org> | 2014-12-18 08:45:28 +0000 |
commit | fe777840ded187e47a984e175b6996cd6a910bf7 (patch) | |
tree | dea6eee182f0d80b355b3b632a6bd9386cd95ce2 | |
parent | 57c600c3f5592fbd6ee7428c1365f996cf08d855 (diff) | |
download | FreeBSD-src-fe777840ded187e47a984e175b6996cd6a910bf7.zip FreeBSD-src-fe777840ded187e47a984e175b6996cd6a910bf7.tar.gz |
MFC r275512:
In addition to r275481 allow threshold notifications work without UNMAP.
While without UNMAP support there is not much initiator can do about it,
the administrator still better be notified about the storage overflow.
Sponsored by: iXsystems, Inc.
-rw-r--r-- | sys/cam/ctl/ctl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index 126c95b85..b4354f4 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -4349,8 +4349,7 @@ ctl_init_log_page_index(struct ctl_lun *lun) continue; if (page_index->page_code == SLS_LOGICAL_BLOCK_PROVISIONING && - ((lun->be_lun->flags & CTL_LUN_FLAG_UNMAP) == 0 || - lun->backend->lun_attr == NULL)) + lun->backend->lun_attr == NULL) continue; if (page_index->page_code != prev) { @@ -10255,8 +10254,8 @@ ctl_inquiry_evpd_lbp(struct ctl_scsiio *ctsio, int alloc_len) lbp_ptr->page_code = SVPD_LBP; scsi_ulto2b(sizeof(*lbp_ptr) - 4, lbp_ptr->page_length); + lbp_ptr->threshold_exponent = CTL_LBP_EXPONENT; if (lun != NULL && lun->be_lun->flags & CTL_LUN_FLAG_UNMAP) { - lbp_ptr->threshold_exponent = CTL_LBP_EXPONENT; lbp_ptr->flags = SVPD_LBP_UNMAP | SVPD_LBP_WS16 | SVPD_LBP_WS10 | SVPD_LBP_RZ | SVPD_LBP_ANC_SUP; lbp_ptr->prov_type = SVPD_LBP_THIN; @@ -14004,7 +14003,6 @@ ctl_thresh_thread(void *arg) be_lun = lun->be_lun; if ((lun->flags & CTL_LUN_DISABLED) || (lun->flags & CTL_LUN_OFFLINE) || - (be_lun->flags & CTL_LUN_FLAG_UNMAP) == 0 || lun->backend->lun_attr == NULL) continue; rwpage = &lun->mode_pages.rw_er_page[CTL_PAGE_CURRENT]; |