Deleted Added
full compact
block_if.c (330449) block_if.c (336161)
1/*-
2 * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
3 *
4 * Copyright (c) 2013 Peter Grehan <grehan@freebsd.org>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
1/*-
2 * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
3 *
4 * Copyright (c) 2013 Peter Grehan <grehan@freebsd.org>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
28 * $FreeBSD: stable/11/usr.sbin/bhyve/block_if.c 330449 2018-03-05 07:26:05Z eadler $
28 * $FreeBSD: stable/11/usr.sbin/bhyve/block_if.c 336161 2018-07-10 04:26:32Z araujo $
29 */
30
31#include <sys/cdefs.h>
29 */
30
31#include <sys/cdefs.h>
32__FBSDID("$FreeBSD: stable/11/usr.sbin/bhyve/block_if.c 330449 2018-03-05 07:26:05Z eadler $");
32__FBSDID("$FreeBSD: stable/11/usr.sbin/bhyve/block_if.c 336161 2018-07-10 04:26:32Z araujo $");
33
34#include <sys/param.h>
35#ifndef WITHOUT_CAPSICUM
36#include <sys/capsicum.h>
37#endif
38#include <sys/queue.h>
39#include <sys/errno.h>
40#include <sys/stat.h>

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

96 int bc_candelete;
97 int bc_rdonly;
98 off_t bc_size;
99 int bc_sectsz;
100 int bc_psectsz;
101 int bc_psectoff;
102 int bc_closing;
103 pthread_t bc_btid[BLOCKIF_NUMTHR];
33
34#include <sys/param.h>
35#ifndef WITHOUT_CAPSICUM
36#include <sys/capsicum.h>
37#endif
38#include <sys/queue.h>
39#include <sys/errno.h>
40#include <sys/stat.h>

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

96 int bc_candelete;
97 int bc_rdonly;
98 off_t bc_size;
99 int bc_sectsz;
100 int bc_psectsz;
101 int bc_psectoff;
102 int bc_closing;
103 pthread_t bc_btid[BLOCKIF_NUMTHR];
104 pthread_mutex_t bc_mtx;
105 pthread_cond_t bc_cond;
104 pthread_mutex_t bc_mtx;
105 pthread_cond_t bc_cond;
106
107 /* Request elements and free/pending/busy queues */
108 TAILQ_HEAD(, blockif_elem) bc_freeq;
109 TAILQ_HEAD(, blockif_elem) bc_pendq;
110 TAILQ_HEAD(, blockif_elem) bc_busyq;
111 struct blockif_elem bc_reqs[BLOCKIF_MAXREQ];
112};
113

--- 733 unchanged lines hidden ---
106
107 /* Request elements and free/pending/busy queues */
108 TAILQ_HEAD(, blockif_elem) bc_freeq;
109 TAILQ_HEAD(, blockif_elem) bc_pendq;
110 TAILQ_HEAD(, blockif_elem) bc_busyq;
111 struct blockif_elem bc_reqs[BLOCKIF_MAXREQ];
112};
113

--- 733 unchanged lines hidden ---