summaryrefslogtreecommitdiff
path: root/usr/src/lib/libstmf/common/stmf.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/lib/libstmf/common/stmf.c')
-rw-r--r--usr/src/lib/libstmf/common/stmf.c193
1 files changed, 96 insertions, 97 deletions
diff --git a/usr/src/lib/libstmf/common/stmf.c b/usr/src/lib/libstmf/common/stmf.c
index e12c189..89d7703 100644
--- a/usr/src/lib/libstmf/common/stmf.c
+++ b/usr/src/lib/libstmf/common/stmf.c
@@ -38,17 +38,16 @@
#include <libnvpair.h>
#include <pthread.h>
#include <syslog.h>
-#include <libstmf.h>
#include <netinet/in.h>
#include <inttypes.h>
-#include <store.h>
#include <locale.h>
#include <math.h>
-#include <libstmf_impl.h>
#include <sys/stmf_ioctl.h>
#include <sys/stmf_sbd_ioctl.h>
#include <sys/pppt_ioctl.h>
-#include <macros.h>
+
+#include "libstmf_impl.h"
+#include "store.h"
#define STMF_PATH "/devices/pseudo/stmf@0:admin"
#define SBD_PATH "/devices/pseudo/stmf_sbd@0:admin"
@@ -123,7 +122,7 @@ static int getDiskAllProps(stmfGuid *luGuid, luResource *hdl);
static int loadDiskPropsFromDriver(luResourceImpl *, sbd_lu_props_t *);
static int removeGuidFromDiskStore(stmfGuid *);
static int addGuidToDiskStore(stmfGuid *, char *);
-static int persistDiskGuid(stmfGuid *, char *, boolean_t);
+static int persistDiskGuid(stmfGuid *, char *, bool);
static int setDiskProp(luResourceImpl *, uint32_t, const char *);
static int getDiskGlobalProp(uint32_t prop, char *propVal, size_t *propLen);
static int checkHexUpper(char *);
@@ -147,8 +146,8 @@ static int loadStmfProp(int fd);
static pthread_mutex_t persistenceTypeLock = PTHREAD_MUTEX_INITIALIZER;
static int iPersistType = 0;
-/* when B_TRUE, no need to access SMF anymore. Just use iPersistType */
-static boolean_t iLibSetPersist = B_FALSE;
+/* when true, no need to access SMF anymore. Just use iPersistType */
+static bool iLibSetPersist = false;
/*
* Open for stmf module
@@ -624,7 +623,7 @@ done:
*
* lu - Logical Unit identifier to which the view entry is added
* viewEntry - view entry to add
- * init - When set to B_TRUE, we are in the init state, i.e. don't call open
+ * init - When set to true, we are in the init state, i.e. don't call open
*/
static int
addViewEntryIoctl(int fd, stmfGuid *lu, stmfViewEntry *viewEntry)
@@ -643,13 +642,13 @@ addViewEntryIoctl(int fd, stmfGuid *lu, stmfViewEntry *viewEntry)
ioctlViewEntry.ve_all_hosts = viewEntry->allHosts;
ioctlViewEntry.ve_all_targets = viewEntry->allTargets;
- if (viewEntry->allHosts == B_FALSE) {
+ if (viewEntry->allHosts == false) {
bcopy(viewEntry->hostGroup, &ioctlViewEntry.ve_host_group.name,
sizeof (stmfGroupName));
ioctlViewEntry.ve_host_group.name_size =
strlen((char *)viewEntry->hostGroup);
}
- if (viewEntry->allTargets == B_FALSE) {
+ if (viewEntry->allTargets == false) {
bcopy(viewEntry->targetGroup,
&ioctlViewEntry.ve_target_group.name,
sizeof (stmfGroupName));
@@ -726,7 +725,7 @@ addViewEntryIoctl(int fd, stmfGuid *lu, stmfViewEntry *viewEntry)
bcopy(&ioctlViewEntry.ve_lu_nbr, viewEntry->luNbr,
sizeof (ioctlViewEntry.ve_lu_nbr));
}
- viewEntry->luNbrValid = B_TRUE;
+ viewEntry->luNbrValid = true;
done:
return (ret);
@@ -758,18 +757,18 @@ stmfAddViewEntry(stmfGuid *lu, stmfViewEntry *viewEntry)
bcopy(viewEntry->hostGroup, iViewEntry.hostGroup,
sizeof (iViewEntry.hostGroup));
} else {
- iViewEntry.allHosts = B_TRUE;
+ iViewEntry.allHosts = true;
}
if (!viewEntry->allTargets) {
bcopy(viewEntry->targetGroup, iViewEntry.targetGroup,
sizeof (iViewEntry.targetGroup));
} else {
- iViewEntry.allTargets = B_TRUE;
+ iViewEntry.allTargets = true;
}
if (viewEntry->luNbrValid) {
- iViewEntry.luNbrValid = B_TRUE;
+ iViewEntry.luNbrValid = true;
bcopy(viewEntry->luNbr, iViewEntry.luNbr,
sizeof (iViewEntry.luNbr));
}
@@ -778,7 +777,7 @@ stmfAddViewEntry(stmfGuid *lu, stmfViewEntry *viewEntry)
* set users return view entry index valid flag to false
* in case of failure
*/
- viewEntry->veIndexValid = B_FALSE;
+ viewEntry->veIndexValid = false;
/* Check to ensure service exists */
if (psCheckService() != STMF_STATUS_SUCCESS) {
@@ -844,7 +843,7 @@ done:
/* set caller's view entry on success */
viewEntry->veIndexValid = iViewEntry.veIndexValid;
viewEntry->veIndex = iViewEntry.veIndex;
- viewEntry->luNbrValid = B_TRUE;
+ viewEntry->luNbrValid = true;
bcopy(iViewEntry.luNbr, viewEntry->luNbr,
sizeof (iViewEntry.luNbr));
}
@@ -1973,7 +1972,7 @@ done:
static int
removeGuidFromDiskStore(stmfGuid *guid)
{
- return (persistDiskGuid(guid, NULL, B_FALSE));
+ return (persistDiskGuid(guid, NULL, false));
}
@@ -1985,7 +1984,7 @@ removeGuidFromDiskStore(stmfGuid *guid)
static int
addGuidToDiskStore(stmfGuid *guid, char *filename)
{
- return (persistDiskGuid(guid, filename, B_TRUE));
+ return (persistDiskGuid(guid, filename, true));
}
@@ -1996,14 +1995,14 @@ addGuidToDiskStore(stmfGuid *guid, char *filename)
*
*/
static int
-persistDiskGuid(stmfGuid *guid, char *filename, boolean_t persist)
+persistDiskGuid(stmfGuid *guid, char *filename, bool persist)
{
char guidAsciiBuf[LU_ASCII_GUID_SIZE + 1] = {0};
nvlist_t *nvl = NULL;
uint64_t setToken;
- boolean_t retryGetProviderData = B_FALSE;
- boolean_t newData = B_FALSE;
+ bool retryGetProviderData = false;
+ bool newData = false;
int ret = STMF_STATUS_SUCCESS;
int retryCnt = 0;
int stmfRet;
@@ -2024,7 +2023,7 @@ persistDiskGuid(stmfGuid *guid, char *filename, boolean_t persist)
do {
- retryGetProviderData = B_FALSE;
+ retryGetProviderData = false;
stmfRet = stmfGetProviderDataProt("sbd", &nvl,
STMF_LU_PROVIDER_TYPE, &setToken);
if (stmfRet != STMF_STATUS_SUCCESS) {
@@ -2037,7 +2036,7 @@ persistDiskGuid(stmfGuid *guid, char *filename, boolean_t persist)
ret = STMF_STATUS_ERROR;
goto done;
}
- newData = B_TRUE;
+ newData = true;
} else {
/*
* if we're persisting the data, it's
@@ -2069,7 +2068,7 @@ persistDiskGuid(stmfGuid *guid, char *filename, boolean_t persist)
if (stmfRet != STMF_STATUS_SUCCESS) {
if (stmfRet == STMF_ERROR_BUSY) {
/* get/set failed, try again */
- retryGetProviderData = B_TRUE;
+ retryGetProviderData = true;
if (retryCnt++ > MAX_PROVIDER_RETRY) {
ret = stmfRet;
break;
@@ -2080,7 +2079,7 @@ persistDiskGuid(stmfGuid *guid, char *filename, boolean_t persist)
/* update failed, try again */
nvlist_free(nvl);
nvl = NULL;
- retryGetProviderData = B_TRUE;
+ retryGetProviderData = true;
if (retryCnt++ > MAX_PROVIDER_RETRY) {
ret = stmfRet;
break;
@@ -2273,11 +2272,11 @@ loadDiskPropsFromDriver(luResourceImpl *hdl, sbd_lu_props_t *sbdProps)
int ret = STMF_STATUS_SUCCESS;
diskResource *diskLu = hdl->resource;
/* copy guid */
- diskLu->luGuidValid = B_TRUE;
+ diskLu->luGuidValid = true;
bcopy(sbdProps->slp_guid, diskLu->luGuid, sizeof (sbdProps->slp_guid));
if (sbdProps->slp_separate_meta && sbdProps->slp_meta_fname_valid) {
- diskLu->luMetaFileNameValid = B_TRUE;
+ diskLu->luMetaFileNameValid = true;
if (strlcpy(diskLu->luMetaFileName,
(char *)&(sbdProps->slp_buf[sbdProps->slp_meta_fname_off]),
sizeof (diskLu->luMetaFileName)) >=
@@ -2287,7 +2286,7 @@ loadDiskPropsFromDriver(luResourceImpl *hdl, sbd_lu_props_t *sbdProps)
}
if (sbdProps->slp_data_fname_valid) {
- diskLu->luDataFileNameValid = B_TRUE;
+ diskLu->luDataFileNameValid = true;
if (strlcpy(diskLu->luDataFileName,
(char *)&(sbdProps->slp_buf[sbdProps->slp_data_fname_off]),
sizeof (diskLu->luDataFileName)) >=
@@ -2297,13 +2296,13 @@ loadDiskPropsFromDriver(luResourceImpl *hdl, sbd_lu_props_t *sbdProps)
}
if (sbdProps->slp_serial_valid) {
- diskLu->serialNumValid = B_TRUE;
+ diskLu->serialNumValid = true;
bcopy(&(sbdProps->slp_buf[sbdProps->slp_serial_off]),
diskLu->serialNum, sbdProps->slp_serial_size);
}
if (sbdProps->slp_mgmt_url_valid) {
- diskLu->luMgmtUrlValid = B_TRUE;
+ diskLu->luMgmtUrlValid = true;
if (strlcpy(diskLu->luMgmtUrl,
(char *)&(sbdProps->slp_buf[sbdProps->slp_mgmt_url_off]),
sizeof (diskLu->luMgmtUrl)) >=
@@ -2313,7 +2312,7 @@ loadDiskPropsFromDriver(luResourceImpl *hdl, sbd_lu_props_t *sbdProps)
}
if (sbdProps->slp_alias_valid) {
- diskLu->luAliasValid = B_TRUE;
+ diskLu->luAliasValid = true;
if (strlcpy(diskLu->luAlias,
(char *)&(sbdProps->slp_buf[sbdProps->slp_alias_off]),
sizeof (diskLu->luAlias)) >=
@@ -2322,7 +2321,7 @@ loadDiskPropsFromDriver(luResourceImpl *hdl, sbd_lu_props_t *sbdProps)
}
} else { /* set alias to data filename if not set */
if (sbdProps->slp_data_fname_valid) {
- diskLu->luAliasValid = B_TRUE;
+ diskLu->luAliasValid = true;
if (strlcpy(diskLu->luAlias,
(char *)&(sbdProps->slp_buf[
sbdProps->slp_data_fname_off]),
@@ -2333,29 +2332,29 @@ loadDiskPropsFromDriver(luResourceImpl *hdl, sbd_lu_props_t *sbdProps)
}
}
- diskLu->vidValid = B_TRUE;
+ diskLu->vidValid = true;
bcopy(sbdProps->slp_vid, diskLu->vid, sizeof (diskLu->vid));
- diskLu->pidValid = B_TRUE;
+ diskLu->pidValid = true;
bcopy(sbdProps->slp_pid, diskLu->pid, sizeof (diskLu->pid));
- diskLu->revValid = B_TRUE;
+ diskLu->revValid = true;
bcopy(sbdProps->slp_rev, diskLu->rev, sizeof (diskLu->rev));
- diskLu->writeProtectEnableValid = B_TRUE;
+ diskLu->writeProtectEnableValid = true;
if (sbdProps->slp_write_protected) {
- diskLu->writeProtectEnable = B_TRUE;
+ diskLu->writeProtectEnable = true;
}
- diskLu->writebackCacheDisableValid = B_TRUE;
+ diskLu->writebackCacheDisableValid = true;
if (sbdProps->slp_writeback_cache_disable_cur) {
- diskLu->writebackCacheDisable = B_TRUE;
+ diskLu->writebackCacheDisable = true;
}
- diskLu->blkSizeValid = B_TRUE;
+ diskLu->blkSizeValid = true;
diskLu->blkSize = sbdProps->slp_blksize;
- diskLu->luSizeValid = B_TRUE;
+ diskLu->luSizeValid = true;
diskLu->luSize = sbdProps->slp_lu_size;
diskLu->accessState = sbdProps->slp_access_state;
@@ -2397,7 +2396,7 @@ getDiskGlobalProp(uint32_t prop, char *propVal, size_t *propLen)
sbd_global_props_t *sbdProps;
void *sbd_realloc;
int retryCnt = 0;
- boolean_t retry;
+ bool retry;
int ioctlRet;
int savedErrno;
int sbdPropsSize = sizeof (*sbdProps) + MAX_SBD_PROPS;
@@ -2424,7 +2423,7 @@ getDiskGlobalProp(uint32_t prop, char *propVal, size_t *propLen)
}
do {
- retry = B_FALSE;
+ retry = false;
sbdIoctl.stmf_version = STMF_VERSION_1;
sbdIoctl.stmf_obuf_size = sbdPropsSize;
sbdIoctl.stmf_obuf = (uint64_t)(unsigned long)sbdProps;
@@ -2456,7 +2455,7 @@ getDiskGlobalProp(uint32_t prop, char *propVal, size_t *propLen)
ret = STMF_ERROR_NOMEM;
break;
}
- retry = B_TRUE;
+ retry = true;
} else {
ret = STMF_ERROR_NOMEM;
}
@@ -2555,7 +2554,7 @@ setDiskGlobalProp(uint32_t resourceProp, const char *propVal)
propLen = strlen(propVal);
mluBufSize += propLen + 1;
sbdGlobalPropsSize += sizeof (sbd_global_props_t) - 8 +
- max(8, mluBufSize);
+ MAX(8, mluBufSize);
/*
* 8 is the size of the buffer set aside for
* concatenation of variable length fields
@@ -2690,7 +2689,7 @@ getDiskProp(luResourceImpl *hdl, uint32_t prop, char *propVal, size_t *propLen)
switch (prop) {
case STMF_LU_PROP_BLOCK_SIZE:
- if (diskLu->blkSizeValid == B_FALSE) {
+ if (diskLu->blkSizeValid == false) {
return (STMF_ERROR_NO_PROP);
}
reqLen = snprintf(propVal, *propLen, "%llu",
@@ -2701,7 +2700,7 @@ getDiskProp(luResourceImpl *hdl, uint32_t prop, char *propVal, size_t *propLen)
}
break;
case STMF_LU_PROP_FILENAME:
- if (diskLu->luDataFileNameValid == B_FALSE) {
+ if (diskLu->luDataFileNameValid == false) {
return (STMF_ERROR_NO_PROP);
}
if ((reqLen = strlcpy(propVal, diskLu->luDataFileName,
@@ -2711,7 +2710,7 @@ getDiskProp(luResourceImpl *hdl, uint32_t prop, char *propVal, size_t *propLen)
}
break;
case STMF_LU_PROP_META_FILENAME:
- if (diskLu->luMetaFileNameValid == B_FALSE) {
+ if (diskLu->luMetaFileNameValid == false) {
return (STMF_ERROR_NO_PROP);
}
if ((reqLen = strlcpy(propVal, diskLu->luMetaFileName,
@@ -2721,7 +2720,7 @@ getDiskProp(luResourceImpl *hdl, uint32_t prop, char *propVal, size_t *propLen)
}
break;
case STMF_LU_PROP_MGMT_URL:
- if (diskLu->luMgmtUrlValid == B_FALSE) {
+ if (diskLu->luMgmtUrlValid == false) {
return (STMF_ERROR_NO_PROP);
}
if ((reqLen = strlcpy(propVal, diskLu->luMgmtUrl,
@@ -2731,7 +2730,7 @@ getDiskProp(luResourceImpl *hdl, uint32_t prop, char *propVal, size_t *propLen)
}
break;
case STMF_LU_PROP_GUID:
- if (diskLu->luGuidValid == B_FALSE) {
+ if (diskLu->luGuidValid == false) {
return (STMF_ERROR_NO_PROP);
}
reqLen = snprintf(propVal, *propLen,
@@ -2751,7 +2750,7 @@ getDiskProp(luResourceImpl *hdl, uint32_t prop, char *propVal, size_t *propLen)
}
break;
case STMF_LU_PROP_SERIAL_NUM:
- if (diskLu->serialNumValid == B_FALSE) {
+ if (diskLu->serialNumValid == false) {
return (STMF_ERROR_NO_PROP);
}
if ((reqLen = strlcpy(propVal, diskLu->serialNum,
@@ -2761,14 +2760,14 @@ getDiskProp(luResourceImpl *hdl, uint32_t prop, char *propVal, size_t *propLen)
}
break;
case STMF_LU_PROP_SIZE:
- if (diskLu->luSizeValid == B_FALSE) {
+ if (diskLu->luSizeValid == false) {
return (STMF_ERROR_NO_PROP);
}
(void) snprintf(propVal, *propLen, "%llu",
(u_longlong_t)diskLu->luSize);
break;
case STMF_LU_PROP_ALIAS:
- if (diskLu->luAliasValid == B_FALSE) {
+ if (diskLu->luAliasValid == false) {
return (STMF_ERROR_NO_PROP);
}
if ((reqLen = strlcpy(propVal, diskLu->luAlias,
@@ -2778,7 +2777,7 @@ getDiskProp(luResourceImpl *hdl, uint32_t prop, char *propVal, size_t *propLen)
}
break;
case STMF_LU_PROP_VID:
- if (diskLu->vidValid == B_FALSE) {
+ if (diskLu->vidValid == false) {
return (STMF_ERROR_NO_PROP);
}
if (*propLen <= sizeof (diskLu->vid)) {
@@ -2788,7 +2787,7 @@ getDiskProp(luResourceImpl *hdl, uint32_t prop, char *propVal, size_t *propLen)
propVal[sizeof (diskLu->vid)] = 0;
break;
case STMF_LU_PROP_PID:
- if (diskLu->pidValid == B_FALSE) {
+ if (diskLu->pidValid == false) {
return (STMF_ERROR_NO_PROP);
}
if (*propLen <= sizeof (diskLu->pid)) {
@@ -2798,7 +2797,7 @@ getDiskProp(luResourceImpl *hdl, uint32_t prop, char *propVal, size_t *propLen)
propVal[sizeof (diskLu->pid)] = 0;
break;
case STMF_LU_PROP_WRITE_PROTECT:
- if (diskLu->writeProtectEnableValid == B_FALSE) {
+ if (diskLu->writeProtectEnableValid == false) {
return (STMF_ERROR_NO_PROP);
}
if (diskLu->writeProtectEnable) {
@@ -2816,7 +2815,7 @@ getDiskProp(luResourceImpl *hdl, uint32_t prop, char *propVal, size_t *propLen)
}
break;
case STMF_LU_PROP_WRITE_CACHE_DISABLE:
- if (diskLu->writebackCacheDisableValid == B_FALSE) {
+ if (diskLu->writebackCacheDisableValid == false) {
return (STMF_ERROR_NO_PROP);
}
if (diskLu->writebackCacheDisable) {
@@ -2877,7 +2876,7 @@ setDiskProp(luResourceImpl *hdl, uint32_t resourceProp, const char *propVal)
sizeof (diskLu->luAlias)) {
return (STMF_ERROR_INVALID_PROPSIZE);
}
- diskLu->luAliasValid = B_TRUE;
+ diskLu->luAliasValid = true;
break;
case STMF_LU_PROP_BLOCK_SIZE: {
const char *tmp = propVal;
@@ -2891,7 +2890,7 @@ setDiskProp(luResourceImpl *hdl, uint32_t resourceProp, const char *propVal)
return (STMF_ERROR_INVALID_PROPSIZE);
}
diskLu->blkSize = numericProp;
- diskLu->blkSizeValid = B_TRUE;
+ diskLu->blkSizeValid = true;
break;
}
case STMF_LU_PROP_COMPANY_ID:
@@ -2912,7 +2911,7 @@ setDiskProp(luResourceImpl *hdl, uint32_t resourceProp, const char *propVal)
if (diskLu->companyId == 0) {
return (STMF_ERROR_INVALID_ARG);
}
- diskLu->companyIdValid = B_TRUE;
+ diskLu->companyIdValid = true;
break;
case STMF_LU_PROP_HOST_ID:
if ((strlcpy(hostIdProp, propVal,
@@ -2933,7 +2932,7 @@ setDiskProp(luResourceImpl *hdl, uint32_t resourceProp, const char *propVal)
if (diskLu->hostId == 0) {
return (STMF_ERROR_INVALID_ARG);
}
- diskLu->hostIdValid = B_TRUE;
+ diskLu->hostIdValid = true;
break;
case STMF_LU_PROP_GUID:
if (strlen(propVal) != LU_ASCII_GUID_SIZE) {
@@ -2958,7 +2957,7 @@ setDiskProp(luResourceImpl *hdl, uint32_t resourceProp, const char *propVal)
for (i = 0; i < sizeof (diskLu->luGuid); i++) {
diskLu->luGuid[i] = guid[i];
}
- diskLu->luGuidValid = B_TRUE;
+ diskLu->luGuidValid = true;
break;
case STMF_LU_PROP_FILENAME:
if ((strlcpy(diskLu->luDataFileName, propVal,
@@ -2966,7 +2965,7 @@ setDiskProp(luResourceImpl *hdl, uint32_t resourceProp, const char *propVal)
sizeof (diskLu->luDataFileName)) {
return (STMF_ERROR_INVALID_PROPSIZE);
}
- diskLu->luDataFileNameValid = B_TRUE;
+ diskLu->luDataFileNameValid = true;
break;
case STMF_LU_PROP_META_FILENAME:
if ((strlcpy(diskLu->luMetaFileName, propVal,
@@ -2974,7 +2973,7 @@ setDiskProp(luResourceImpl *hdl, uint32_t resourceProp, const char *propVal)
sizeof (diskLu->luMetaFileName)) {
return (STMF_ERROR_INVALID_PROPSIZE);
}
- diskLu->luMetaFileNameValid = B_TRUE;
+ diskLu->luMetaFileNameValid = true;
break;
case STMF_LU_PROP_MGMT_URL:
if ((strlcpy(diskLu->luMgmtUrl, propVal,
@@ -2982,7 +2981,7 @@ setDiskProp(luResourceImpl *hdl, uint32_t resourceProp, const char *propVal)
sizeof (diskLu->luMgmtUrl)) {
return (STMF_ERROR_INVALID_PROPSIZE);
}
- diskLu->luMgmtUrlValid = B_TRUE;
+ diskLu->luMgmtUrlValid = true;
break;
case STMF_LU_PROP_PID:
if ((propSize = strlen(propVal)) >
@@ -2990,7 +2989,7 @@ setDiskProp(luResourceImpl *hdl, uint32_t resourceProp, const char *propVal)
return (STMF_ERROR_INVALID_PROPSIZE);
}
(void) strncpy(diskLu->pid, propVal, propSize);
- diskLu->pidValid = B_TRUE;
+ diskLu->pidValid = true;
break;
case STMF_LU_PROP_SERIAL_NUM:
if ((propSize = strlen(propVal)) >
@@ -2998,13 +2997,13 @@ setDiskProp(luResourceImpl *hdl, uint32_t resourceProp, const char *propVal)
return (STMF_ERROR_INVALID_PROPSIZE);
}
(void) strncpy(diskLu->serialNum, propVal, propSize);
- diskLu->serialNumValid = B_TRUE;
+ diskLu->serialNumValid = true;
break;
case STMF_LU_PROP_SIZE:
if ((niceStrToNum(propVal, &diskLu->luSize) != 0)) {
return (STMF_ERROR_INVALID_ARG);
}
- diskLu->luSizeValid = B_TRUE;
+ diskLu->luSizeValid = true;
break;
case STMF_LU_PROP_VID:
if ((propSize = strlen(propVal)) >
@@ -3012,27 +3011,27 @@ setDiskProp(luResourceImpl *hdl, uint32_t resourceProp, const char *propVal)
return (STMF_ERROR_INVALID_PROPSIZE);
}
(void) strncpy(diskLu->vid, propVal, propSize);
- diskLu->vidValid = B_TRUE;
+ diskLu->vidValid = true;
break;
case STMF_LU_PROP_WRITE_PROTECT:
if (strcasecmp(propVal, "TRUE") == 0) {
- diskLu->writeProtectEnable = B_TRUE;
+ diskLu->writeProtectEnable = true;
} else if (strcasecmp(propVal, "FALSE") == 0) {
- diskLu->writeProtectEnable = B_FALSE;
+ diskLu->writeProtectEnable = false;
} else {
return (STMF_ERROR_INVALID_ARG);
}
- diskLu->writeProtectEnableValid = B_TRUE;
+ diskLu->writeProtectEnableValid = true;
break;
case STMF_LU_PROP_WRITE_CACHE_DISABLE:
if (strcasecmp(propVal, "TRUE") == 0) {
- diskLu->writebackCacheDisable = B_TRUE;
+ diskLu->writebackCacheDisable = true;
} else if (strcasecmp(propVal, "FALSE") == 0) {
- diskLu->writebackCacheDisable = B_FALSE;
+ diskLu->writebackCacheDisable = false;
} else {
return (STMF_ERROR_INVALID_ARG);
}
- diskLu->writebackCacheDisableValid = B_TRUE;
+ diskLu->writebackCacheDisableValid = true;
break;
case STMF_LU_PROP_ACCESS_STATE:
ret = STMF_ERROR_INVALID_PROP;
@@ -4859,17 +4858,17 @@ stmfGetViewEntryList(stmfGuid *lu, stmfViewEntryList **viewEntryList)
/* copy to caller's buffer */
for (i = 0; i < listCnt; i++) {
- (*viewEntryList)->ve[i].veIndexValid = B_TRUE;
+ (*viewEntryList)->ve[i].veIndexValid = true;
(*viewEntryList)->ve[i].veIndex = fVeList[i].ve_ndx;
if (fVeList[i].ve_all_hosts == 1) {
- (*viewEntryList)->ve[i].allHosts = B_TRUE;
+ (*viewEntryList)->ve[i].allHosts = true;
} else {
bcopy(fVeList[i].ve_host_group.name,
(*viewEntryList)->ve[i].hostGroup,
fVeList[i].ve_host_group.name_size);
}
if (fVeList[i].ve_all_targets == 1) {
- (*viewEntryList)->ve[i].allTargets = B_TRUE;
+ (*viewEntryList)->ve[i].allTargets = true;
} else {
bcopy(fVeList[i].ve_target_group.name,
(*viewEntryList)->ve[i].targetGroup,
@@ -4877,7 +4876,7 @@ stmfGetViewEntryList(stmfGuid *lu, stmfViewEntryList **viewEntryList)
}
bcopy(fVeList[i].ve_lu_nbr, (*viewEntryList)->ve[i].luNbr,
sizeof ((*viewEntryList)->ve[i].luNbr));
- (*viewEntryList)->ve[i].luNbrValid = B_TRUE;
+ (*viewEntryList)->ve[i].luNbrValid = true;
}
/*
@@ -5193,7 +5192,7 @@ out:
*
*/
int
-stmfGetAluaState(boolean_t *enabled, uint32_t *node)
+stmfGetAluaState(bool *enabled, uint32_t *node)
{
int ret = STMF_STATUS_SUCCESS;
int fd;
@@ -5238,9 +5237,9 @@ stmfGetAluaState(boolean_t *enabled, uint32_t *node)
}
} else {
if (alua_state.alua_state == 1) {
- *enabled = B_TRUE;
+ *enabled = true;
} else {
- *enabled = B_FALSE;
+ *enabled = false;
}
*node = alua_state.alua_node;
}
@@ -5255,7 +5254,7 @@ stmfGetAluaState(boolean_t *enabled, uint32_t *node)
*
*/
int
-stmfSetAluaState(boolean_t enabled, uint32_t node)
+stmfSetAluaState(bool enabled, uint32_t node)
{
int ret = STMF_STATUS_SUCCESS;
int fd;
@@ -5263,7 +5262,7 @@ stmfSetAluaState(boolean_t enabled, uint32_t node)
stmf_alua_state_desc_t alua_state = {0};
int ioctlRet;
- if ((enabled != B_TRUE && enabled != B_FALSE) || (node > 1)) {
+ if ((enabled != true && enabled != false) || (node > 1)) {
return (STMF_ERROR_INVALID_ARG);
}
@@ -6137,7 +6136,7 @@ stmfRemoveViewEntry(stmfGuid *lu, uint32_t viewEntryIndex)
return (ret);
bzero(&ioctlViewEntry, sizeof (ioctlViewEntry));
- ioctlViewEntry.ve_ndx_valid = B_TRUE;
+ ioctlViewEntry.ve_ndx_valid = true;
ioctlViewEntry.ve_ndx = viewEntryIndex;
bcopy(lu, &ioctlViewEntry.ve_guid, sizeof (stmfGuid));
@@ -6340,7 +6339,7 @@ getProviderData(char *providerName, nvlist_t **nvl, int providerType,
int retryCnt = 0;
int retryCntMax = MAX_PROVIDER_RETRY;
stmf_ppioctl_data_t ppi = {0}, *ppi_out = NULL;
- boolean_t retry = B_TRUE;
+ bool retry = true;
stmf_iocdata_t stmfIoctl;
if (providerName == NULL) {
@@ -6411,7 +6410,7 @@ getProviderData(char *providerName, nvlist_t **nvl, int providerType,
free(ppi_out);
ppi_out = NULL;
if (retryCnt++ > retryCntMax) {
- retry = B_FALSE;
+ retry = false;
ret = STMF_ERROR_BUSY;
} else {
ret =
@@ -6574,7 +6573,7 @@ done:
* set the persistence method in the library only or library and service
*/
int
-stmfSetPersistMethod(uint8_t persistType, boolean_t serviceSet)
+stmfSetPersistMethod(uint8_t persistType, bool serviceSet)
{
int ret = STMF_STATUS_SUCCESS;
int oldPersist;
@@ -6583,14 +6582,14 @@ stmfSetPersistMethod(uint8_t persistType, boolean_t serviceSet)
oldPersist = iPersistType;
if (persistType == STMF_PERSIST_NONE ||
persistType == STMF_PERSIST_SMF) {
- iLibSetPersist = B_TRUE;
+ iLibSetPersist = true;
iPersistType = persistType;
} else {
(void) pthread_mutex_unlock(&persistenceTypeLock);
return (STMF_ERROR_INVALID_ARG);
}
/* Is this for this library open or in SMF */
- if (serviceSet == B_TRUE) {
+ if (serviceSet == true) {
ret = psSetServicePersist(persistType);
if (ret != STMF_PS_SUCCESS) {
ret = STMF_ERROR_PERSIST_TYPE;
@@ -6633,7 +6632,7 @@ iGetPersistMethod()
* serviceState
*/
int
-stmfGetPersistMethod(uint8_t *persistType, boolean_t serviceState)
+stmfGetPersistMethod(uint8_t *persistType, bool serviceState)
{
int ret = STMF_STATUS_SUCCESS;
@@ -6785,13 +6784,13 @@ validateLunNumIoctl(int fd, stmfViewEntry *viewEntry)
ioctlViewEntry.ve_all_hosts = viewEntry->allHosts;
ioctlViewEntry.ve_all_targets = viewEntry->allTargets;
- if (viewEntry->allHosts == B_FALSE) {
+ if (viewEntry->allHosts == false) {
bcopy(viewEntry->hostGroup, &ioctlViewEntry.ve_host_group.name,
sizeof (stmfGroupName));
ioctlViewEntry.ve_host_group.name_size =
strlen((char *)viewEntry->hostGroup);
}
- if (viewEntry->allTargets == B_FALSE) {
+ if (viewEntry->allTargets == false) {
bcopy(viewEntry->targetGroup,
&ioctlViewEntry.ve_target_group.name,
sizeof (stmfGroupName));
@@ -6894,18 +6893,18 @@ stmfValidateView(stmfViewEntry *viewEntry)
bcopy(viewEntry->hostGroup, iViewEntry.hostGroup,
sizeof (iViewEntry.hostGroup));
} else {
- iViewEntry.allHosts = B_TRUE;
+ iViewEntry.allHosts = true;
}
if (!viewEntry->allTargets) {
bcopy(viewEntry->targetGroup, iViewEntry.targetGroup,
sizeof (iViewEntry.targetGroup));
} else {
- iViewEntry.allTargets = B_TRUE;
+ iViewEntry.allTargets = true;
}
if (viewEntry->luNbrValid) {
- iViewEntry.luNbrValid = B_TRUE;
+ iViewEntry.luNbrValid = true;
bcopy(viewEntry->luNbr, iViewEntry.luNbr,
sizeof (iViewEntry.luNbr));
}
@@ -6914,7 +6913,7 @@ stmfValidateView(stmfViewEntry *viewEntry)
* set users return view entry index valid flag to false
* in case of failure
*/
- viewEntry->veIndexValid = B_FALSE;
+ viewEntry->veIndexValid = false;
/* Check to ensure service exists */
if (psCheckService() != STMF_STATUS_SUCCESS) {