Deleted Added
sdiff udiff text old ( 273310 ) new ( 273319 )
full compact
ctl_frontend_iscsi.h (273310) ctl_frontend_iscsi.h (273319)
1/*-
2 * Copyright (c) 2012 The FreeBSD Foundation
3 * All rights reserved.
4 *
5 * This software was developed by Edward Tomasz Napierala under sponsorship
6 * from the FreeBSD Foundation.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
1/*-
2 * Copyright (c) 2012 The FreeBSD Foundation
3 * All rights reserved.
4 *
5 * This software was developed by Edward Tomasz Napierala under sponsorship
6 * from the FreeBSD Foundation.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * $FreeBSD: stable/10/sys/cam/ctl/ctl_frontend_iscsi.h 273310 2014-10-20 07:32:33Z mav $
29 * $FreeBSD: stable/10/sys/cam/ctl/ctl_frontend_iscsi.h 273319 2014-10-20 07:59:29Z mav $
30 */
31
32#ifndef CTL_FRONTEND_ISCSI_H
33#define CTL_FRONTEND_ISCSI_H
34
35#define CFISCSI_TARGET_STATE_INVALID 0
36#define CFISCSI_TARGET_STATE_ACTIVE 1
37#define CFISCSI_TARGET_STATE_DYING 2
38
39struct cfiscsi_target {
40 TAILQ_ENTRY(cfiscsi_target) ct_next;
41 uint32_t ct_luns[CTL_MAX_LUNS];
42 struct cfiscsi_softc *ct_softc;
43 volatile u_int ct_refcount;
44 char ct_name[CTL_ISCSI_NAME_LEN];
45 char ct_alias[CTL_ISCSI_ALIAS_LEN];
46 int ct_state;
47 int ct_online;
30 */
31
32#ifndef CTL_FRONTEND_ISCSI_H
33#define CTL_FRONTEND_ISCSI_H
34
35#define CFISCSI_TARGET_STATE_INVALID 0
36#define CFISCSI_TARGET_STATE_ACTIVE 1
37#define CFISCSI_TARGET_STATE_DYING 2
38
39struct cfiscsi_target {
40 TAILQ_ENTRY(cfiscsi_target) ct_next;
41 uint32_t ct_luns[CTL_MAX_LUNS];
42 struct cfiscsi_softc *ct_softc;
43 volatile u_int ct_refcount;
44 char ct_name[CTL_ISCSI_NAME_LEN];
45 char ct_alias[CTL_ISCSI_ALIAS_LEN];
46 int ct_state;
47 int ct_online;
48 int ct_target_id;
48 struct ctl_port ct_port;
49};
50
51struct cfiscsi_data_wait {
52 TAILQ_ENTRY(cfiscsi_data_wait) cdw_next;
53 union ctl_io *cdw_ctl_io;
54 uint32_t cdw_target_transfer_tag;
55 uint32_t cdw_initiator_task_tag;

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

105#ifdef ICL_KERNEL_PROXY
106struct icl_listen;
107#endif
108
109struct cfiscsi_softc {
110 struct mtx lock;
111 char port_name[32];
112 int online;
49 struct ctl_port ct_port;
50};
51
52struct cfiscsi_data_wait {
53 TAILQ_ENTRY(cfiscsi_data_wait) cdw_next;
54 union ctl_io *cdw_ctl_io;
55 uint32_t cdw_target_transfer_tag;
56 uint32_t cdw_initiator_task_tag;

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

106#ifdef ICL_KERNEL_PROXY
107struct icl_listen;
108#endif
109
110struct cfiscsi_softc {
111 struct mtx lock;
112 char port_name[32];
113 int online;
114 int last_target_id;
113 unsigned int last_session_id;
114 TAILQ_HEAD(, cfiscsi_target) targets;
115 TAILQ_HEAD(, cfiscsi_session) sessions;
116#ifdef ICL_KERNEL_PROXY
117 struct icl_listen *listener;
118 struct cv accept_cv;
119#endif
120};
121
122#endif /* !CTL_FRONTEND_ISCSI_H */
115 unsigned int last_session_id;
116 TAILQ_HEAD(, cfiscsi_target) targets;
117 TAILQ_HEAD(, cfiscsi_session) sessions;
118#ifdef ICL_KERNEL_PROXY
119 struct icl_listen *listener;
120 struct cv accept_cv;
121#endif
122};
123
124#endif /* !CTL_FRONTEND_ISCSI_H */