| primary.c (213580) | primary.c (214274) |
|---|---|
| 1/*- 2 * Copyright (c) 2009 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 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/primary.c 213580 2010-10-08 15:05:39Z pjd $"); | 32__FBSDID("$FreeBSD: head/sbin/hastd/primary.c 214274 2010-10-24 15:41:23Z pjd $"); |
| 33 34#include <sys/types.h> 35#include <sys/time.h> 36#include <sys/bio.h> 37#include <sys/disk.h> 38#include <sys/refcount.h> 39#include <sys/stat.h> 40 --- 600 unchanged lines hidden (view full) --- 641 activemap_merge(res->hr_amp, map, mapsize); 642 free(map); 643 /* 644 * Now that we merged bitmaps from both nodes, flush it to the 645 * disk before we start to synchronize. 646 */ 647 (void)hast_activemap_flush(res); 648 } | 33 34#include <sys/types.h> 35#include <sys/time.h> 36#include <sys/bio.h> 37#include <sys/disk.h> 38#include <sys/refcount.h> 39#include <sys/stat.h> 40 --- 600 unchanged lines hidden (view full) --- 641 activemap_merge(res->hr_amp, map, mapsize); 642 free(map); 643 /* 644 * Now that we merged bitmaps from both nodes, flush it to the 645 * disk before we start to synchronize. 646 */ 647 (void)hast_activemap_flush(res); 648 } |
| 649 nv_free(nvin); |
|
| 649 pjdlog_info("Connected to %s.", res->hr_remoteaddr); 650 if (inp != NULL && outp != NULL) { 651 *inp = in; 652 *outp = out; 653 } else { 654 res->hr_remotein = in; 655 res->hr_remoteout = out; 656 } --- 1330 unchanged lines hidden --- | 650 pjdlog_info("Connected to %s.", res->hr_remoteaddr); 651 if (inp != NULL && outp != NULL) { 652 *inp = in; 653 *outp = out; 654 } else { 655 res->hr_remotein = in; 656 res->hr_remoteout = out; 657 } --- 1330 unchanged lines hidden --- |