| secondary.c (211882) | secondary.c (211977) |
|---|---|
| 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 211882 2010-08-27 14:26:37Z pjd $"); | 32__FBSDID("$FreeBSD: head/sbin/hastd/secondary.c 211977 2010-08-29 21:41:53Z 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 <assert.h> --- 11 unchanged lines hidden (view full) --- 52#include <activemap.h> 53#include <nv.h> 54#include <pjdlog.h> 55 56#include "control.h" 57#include "hast.h" 58#include "hast_proto.h" 59#include "hastd.h" | 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 <assert.h> --- 11 unchanged lines hidden (view full) --- 52#include <activemap.h> 53#include <nv.h> 54#include <pjdlog.h> 55 56#include "control.h" 57#include "hast.h" 58#include "hast_proto.h" 59#include "hastd.h" |
| 60#include "hooks.h" |
|
| 60#include "metadata.h" 61#include "proto.h" 62#include "subr.h" 63#include "synch.h" 64 65struct hio { 66 uint64_t hio_seq; 67 int hio_error; --- 284 unchanged lines hidden (view full) --- 352 /* This is parent. */ 353 proto_close(res->hr_remotein); 354 res->hr_remotein = NULL; 355 proto_close(res->hr_remoteout); 356 res->hr_remoteout = NULL; 357 res->hr_workerpid = pid; 358 return; 359 } | 61#include "metadata.h" 62#include "proto.h" 63#include "subr.h" 64#include "synch.h" 65 66struct hio { 67 uint64_t hio_seq; 68 int hio_error; --- 284 unchanged lines hidden (view full) --- 353 /* This is parent. */ 354 proto_close(res->hr_remotein); 355 res->hr_remotein = NULL; 356 proto_close(res->hr_remoteout); 357 res->hr_remoteout = NULL; 358 res->hr_workerpid = pid; 359 return; 360 } |
| 361 |
|
| 360 (void)pidfile_close(pfh); | 362 (void)pidfile_close(pfh); |
| 363 hook_fini(); |
|
| 361 362 setproctitle("%s (secondary)", res->hr_name); 363 364 signal(SIGHUP, SIG_DFL); 365 signal(SIGCHLD, SIG_DFL); 366 367 /* Error in setting timeout is not critical, but why should it fail? */ 368 if (proto_timeout(res->hr_remotein, 0) < 0) --- 334 unchanged lines hidden --- | 364 365 setproctitle("%s (secondary)", res->hr_name); 366 367 signal(SIGHUP, SIG_DFL); 368 signal(SIGCHLD, SIG_DFL); 369 370 /* Error in setting timeout is not critical, but why should it fail? */ 371 if (proto_timeout(res->hr_remotein, 0) < 0) --- 334 unchanged lines hidden --- |