secondary.c (220271) | secondary.c (220865) |
---|---|
1/*- 2 * Copyright (c) 2009-2010 The FreeBSD Foundation 3 * Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org> 4 * All rights reserved. 5 * 6 * This software was developed by Pawel Jakub Dawidek under sponsorship from 7 * the FreeBSD Foundation. 8 * --- 15 unchanged lines hidden (view full) --- 24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 28 * SUCH DAMAGE. 29 */ 30 31#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2009-2010 The FreeBSD Foundation 3 * Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org> 4 * All rights reserved. 5 * 6 * This software was developed by Pawel Jakub Dawidek under sponsorship from 7 * the FreeBSD Foundation. 8 * --- 15 unchanged lines hidden (view full) --- 24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 28 * SUCH DAMAGE. 29 */ 30 31#include <sys/cdefs.h> |
32__FBSDID("$FreeBSD: head/sbin/hastd/secondary.c 220271 2011-04-02 09:25:13Z pjd $"); | 32__FBSDID("$FreeBSD: head/sbin/hastd/secondary.c 220865 2011-04-19 19:26:27Z pjd $"); |
33 34#include <sys/param.h> 35#include <sys/time.h> 36#include <sys/bio.h> 37#include <sys/disk.h> 38#include <sys/stat.h> 39 40#include <err.h> --- 215 unchanged lines hidden (view full) --- 256 exit(EX_NOINPUT); 257 if (nv_exists(nvin, "virgin")) { 258 free(map); 259 map = NULL; 260 mapsize = 0; 261 } else { 262 memset(map, 0xff, mapsize); 263 } | 33 34#include <sys/param.h> 35#include <sys/time.h> 36#include <sys/bio.h> 37#include <sys/disk.h> 38#include <sys/stat.h> 39 40#include <err.h> --- 215 unchanged lines hidden (view full) --- 256 exit(EX_NOINPUT); 257 if (nv_exists(nvin, "virgin")) { 258 free(map); 259 map = NULL; 260 mapsize = 0; 261 } else { 262 memset(map, 0xff, mapsize); 263 } |
264 nv_add_int8(nvout, 1, "virgin"); |
|
264 nv_add_uint8(nvout, HAST_SYNCSRC_PRIMARY, "syncsrc"); 265 } else if (res->hr_resuid != resuid) { 266 char errmsg[256]; 267 268 (void)snprintf(errmsg, sizeof(errmsg), 269 "Resource unique ID mismatch (primary=%ju, secondary=%ju).", 270 (uintmax_t)resuid, (uintmax_t)res->hr_resuid); 271 pjdlog_error("%s", errmsg); --- 521 unchanged lines hidden --- | 265 nv_add_uint8(nvout, HAST_SYNCSRC_PRIMARY, "syncsrc"); 266 } else if (res->hr_resuid != resuid) { 267 char errmsg[256]; 268 269 (void)snprintf(errmsg, sizeof(errmsg), 270 "Resource unique ID mismatch (primary=%ju, secondary=%ju).", 271 (uintmax_t)resuid, (uintmax_t)res->hr_resuid); 272 pjdlog_error("%s", errmsg); --- 521 unchanged lines hidden --- |