| libzfs_status.c (302408) | libzfs_status.c (339034) |
|---|---|
| 1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 205 unchanged lines hidden (view full) --- 214 verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_STATE, 215 &stateval) == 0); 216 217 /* 218 * Currently resilvering a vdev 219 */ 220 (void) nvlist_lookup_uint64_array(nvroot, ZPOOL_CONFIG_SCAN_STATS, 221 (uint64_t **)&ps, &psc); | 1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 205 unchanged lines hidden (view full) --- 214 verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_STATE, 215 &stateval) == 0); 216 217 /* 218 * Currently resilvering a vdev 219 */ 220 (void) nvlist_lookup_uint64_array(nvroot, ZPOOL_CONFIG_SCAN_STATS, 221 (uint64_t **)&ps, &psc); |
| 222 if (ps && ps->pss_func == POOL_SCAN_RESILVER && | 222 if (ps != NULL && ps->pss_func == POOL_SCAN_RESILVER && |
| 223 ps->pss_state == DSS_SCANNING) 224 return (ZPOOL_STATUS_RESILVERING); 225 226 /* 227 * Pool last accessed by another system. 228 */ 229 (void) nvlist_lookup_uint64(config, ZPOOL_CONFIG_HOSTID, &hostid); 230 if (hostid != 0 && (unsigned long)hostid != gethostid() && --- 237 unchanged lines hidden --- | 223 ps->pss_state == DSS_SCANNING) 224 return (ZPOOL_STATUS_RESILVERING); 225 226 /* 227 * Pool last accessed by another system. 228 */ 229 (void) nvlist_lookup_uint64(config, ZPOOL_CONFIG_HOSTID, &hostid); 230 if (hostid != 0 && (unsigned long)hostid != gethostid() && --- 237 unchanged lines hidden --- |