Deleted Added
full compact
primary.c (218043) primary.c (218045)
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 218043 2011-01-28 21:52:37Z pjd $");
32__FBSDID("$FreeBSD: head/sbin/hastd/primary.c 218045 2011-01-28 21:57:42Z 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

--- 791 unchanged lines hidden (view full) ---

832 mode = pjdlog_mode_get();
833
834 /* Declare that we are sender. */
835 proto_send(res->hr_event, NULL, 0);
836 /* Declare that we are receiver. */
837 proto_recv(res->hr_ctrl, NULL, 0);
838 descriptors_cleanup(res);
839
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

--- 791 unchanged lines hidden (view full) ---

832 mode = pjdlog_mode_get();
833
834 /* Declare that we are sender. */
835 proto_send(res->hr_event, NULL, 0);
836 /* Declare that we are receiver. */
837 proto_recv(res->hr_ctrl, NULL, 0);
838 descriptors_cleanup(res);
839
840 descriptors_assert(res, mode);
841
840 pjdlog_init(mode);
841 pjdlog_prefix_set("[%s] (%s) ", res->hr_name, role2str(res->hr_role));
842 setproctitle("%s (primary)", res->hr_name);
843
844 init_local(res);
845 init_ggate(res);
846 init_environment(res);
847

--- 1207 unchanged lines hidden ---
842 pjdlog_init(mode);
843 pjdlog_prefix_set("[%s] (%s) ", res->hr_name, role2str(res->hr_role));
844 setproctitle("%s (primary)", res->hr_name);
845
846 init_local(res);
847 init_ggate(res);
848 init_environment(res);
849

--- 1207 unchanged lines hidden ---