p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/iscsi: Replace __kernel_sockaddr_storage with sockaddr_storage 

It appears to be what the rest of the kernel does, so let's do it too.

Signed-off-by: Andy Grover <agrover@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
Andy Grover 2015-08-24 10:26:06 -07:00 committed by Nicholas Bellinger
parent dc58f760e2
commit 13a3cf08fa
11 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/infiniband/ulp/isert/ib_isert.c
View File

@ -3102,7 +3102,7 @@ isert_setup_id(struct isert_np *isert_np)
static int static int
isert_setup_np(struct iscsi_np *np, isert_setup_np(struct iscsi_np *np,
struct __kernel_sockaddr_storage *ksockaddr) struct sockaddr_storage *ksockaddr)
{ {
struct isert_np *isert_np; struct isert_np *isert_np;
struct rdma_cm_id *isert_lid; struct rdma_cm_id *isert_lid;
@ -3124,7 +3124,7 @@ isert_setup_np(struct iscsi_np *np,
* in iscsi_target_configfs.c code.. * in iscsi_target_configfs.c code..
*/ */
memcpy(&np->np_sockaddr, ksockaddr, memcpy(&np->np_sockaddr, ksockaddr,
sizeof(struct __kernel_sockaddr_storage)); sizeof(struct sockaddr_storage));
isert_lid = isert_setup_id(isert_np); isert_lid = isert_setup_id(isert_np);
if (IS_ERR(isert_lid)) { if (IS_ERR(isert_lid)) {

8
drivers/target/iscsi/iscsi_target.c
View File

@ -269,7 +269,7 @@ int iscsit_deaccess_np(struct iscsi_np *np, struct iscsi_portal_group *tpg,
} }
bool iscsit_check_np_match( bool iscsit_check_np_match(
struct __kernel_sockaddr_storage *sockaddr, struct sockaddr_storage *sockaddr,
struct iscsi_np *np, struct iscsi_np *np,
int network_transport) int network_transport)
{ {
@ -311,7 +311,7 @@ bool iscsit_check_np_match(
* Called with mutex np_lock held * Called with mutex np_lock held
*/ */
static struct iscsi_np *iscsit_get_np( static struct iscsi_np *iscsit_get_np(
struct __kernel_sockaddr_storage *sockaddr, struct sockaddr_storage *sockaddr,
int network_transport) int network_transport)
{ {
struct iscsi_np *np; struct iscsi_np *np;
@ -342,7 +342,7 @@ static struct iscsi_np *iscsit_get_np(
} }
struct iscsi_np *iscsit_add_np( struct iscsi_np *iscsit_add_np(
struct __kernel_sockaddr_storage *sockaddr, struct sockaddr_storage *sockaddr,
int network_transport) int network_transport)
{ {
struct iscsi_np *np; struct iscsi_np *np;
@ -3452,7 +3452,7 @@ iscsit_build_sendtargets_response(struct iscsi_cmd *cmd,
tpg_np_list) { tpg_np_list) {
struct iscsi_np *np = tpg_np->tpg_np; struct iscsi_np *np = tpg_np->tpg_np;
bool inaddr_any = iscsit_check_inaddr_any(np); bool inaddr_any = iscsit_check_inaddr_any(np);
struct __kernel_sockaddr_storage *sockaddr; struct sockaddr_storage *sockaddr;
if (np->np_network_transport != network_transport) if (np->np_network_transport != network_transport)
continue; continue;

4
drivers/target/iscsi/iscsi_target.h
View File

@ -10,9 +10,9 @@ extern int iscsit_access_np(struct iscsi_np *, struct iscsi_portal_group *);
extern void iscsit_login_kref_put(struct kref *); extern void iscsit_login_kref_put(struct kref *);
extern int iscsit_deaccess_np(struct iscsi_np *, struct iscsi_portal_group *, extern int iscsit_deaccess_np(struct iscsi_np *, struct iscsi_portal_group *,
struct iscsi_tpg_np *); struct iscsi_tpg_np *);
extern bool iscsit_check_np_match(struct __kernel_sockaddr_storage *, extern bool iscsit_check_np_match(struct sockaddr_storage *,
struct iscsi_np *, int); struct iscsi_np *, int);
extern struct iscsi_np *iscsit_add_np(struct __kernel_sockaddr_storage *, extern struct iscsi_np *iscsit_add_np(struct sockaddr_storage *,
int); int);
extern int iscsit_reset_np_thread(struct iscsi_np *, struct iscsi_tpg_np *, extern int iscsit_reset_np_thread(struct iscsi_np *, struct iscsi_tpg_np *,
struct iscsi_portal_group *, bool); struct iscsi_portal_group *, bool);

4
drivers/target/iscsi/iscsi_target_configfs.c
View File

@ -220,7 +220,7 @@ static struct se_tpg_np *lio_target_call_addnptotpg(
struct iscsi_portal_group *tpg; struct iscsi_portal_group *tpg;
struct iscsi_tpg_np *tpg_np; struct iscsi_tpg_np *tpg_np;
char *str, *str2, *ip_str, *port_str; char *str, *str2, *ip_str, *port_str;
struct __kernel_sockaddr_storage sockaddr; struct sockaddr_storage sockaddr;
struct sockaddr_in *sock_in; struct sockaddr_in *sock_in;
struct sockaddr_in6 *sock_in6; struct sockaddr_in6 *sock_in6;
unsigned long port; unsigned long port;
@ -235,7 +235,7 @@ static struct se_tpg_np *lio_target_call_addnptotpg(
memset(buf, 0, MAX_PORTAL_LEN + 1); memset(buf, 0, MAX_PORTAL_LEN + 1);
snprintf(buf, MAX_PORTAL_LEN + 1, "%s", name); snprintf(buf, MAX_PORTAL_LEN + 1, "%s", name);
memset(&sockaddr, 0, sizeof(struct __kernel_sockaddr_storage)); memset(&sockaddr, 0, sizeof(struct sockaddr_storage));
str = strstr(buf, "["); str = strstr(buf, "[");
if (str) { if (str) {

6
drivers/target/iscsi/iscsi_target_login.c
View File

@ -877,7 +877,7 @@ static void iscsi_stop_login_thread_timer(struct iscsi_np *np)
int iscsit_setup_np( int iscsit_setup_np(
struct iscsi_np *np, struct iscsi_np *np,
struct __kernel_sockaddr_storage *sockaddr) struct sockaddr_storage *sockaddr)
{ {
struct socket *sock = NULL; struct socket *sock = NULL;
int backlog = ISCSIT_TCP_BACKLOG, ret, opt = 0, len; int backlog = ISCSIT_TCP_BACKLOG, ret, opt = 0, len;
@ -916,7 +916,7 @@ int iscsit_setup_np(
* in iscsi_target_configfs.c code.. * in iscsi_target_configfs.c code..
*/ */
memcpy(&np->np_sockaddr, sockaddr, memcpy(&np->np_sockaddr, sockaddr,
sizeof(struct __kernel_sockaddr_storage)); sizeof(struct sockaddr_storage));
if (sockaddr->ss_family == AF_INET6) if (sockaddr->ss_family == AF_INET6)
len = sizeof(struct sockaddr_in6); len = sizeof(struct sockaddr_in6);
@ -975,7 +975,7 @@ int iscsit_setup_np(
int iscsi_target_setup_login_socket( int iscsi_target_setup_login_socket(
struct iscsi_np *np, struct iscsi_np *np,
struct __kernel_sockaddr_storage *sockaddr) struct sockaddr_storage *sockaddr)
{ {
struct iscsit_transport *t; struct iscsit_transport *t;
int rc; int rc;

4
drivers/target/iscsi/iscsi_target_login.h
View File

@ -5,9 +5,9 @@ extern int iscsi_login_setup_crypto(struct iscsi_conn *);
extern int iscsi_check_for_session_reinstatement(struct iscsi_conn *); extern int iscsi_check_for_session_reinstatement(struct iscsi_conn *);
extern int iscsi_login_post_auth_non_zero_tsih(struct iscsi_conn *, u16, u32); extern int iscsi_login_post_auth_non_zero_tsih(struct iscsi_conn *, u16, u32);
extern int iscsit_setup_np(struct iscsi_np *, extern int iscsit_setup_np(struct iscsi_np *,
struct __kernel_sockaddr_storage *); struct sockaddr_storage *);
extern int iscsi_target_setup_login_socket(struct iscsi_np *, extern int iscsi_target_setup_login_socket(struct iscsi_np *,
struct __kernel_sockaddr_storage *); struct sockaddr_storage *);
extern int iscsit_accept_np(struct iscsi_np *, struct iscsi_conn *); extern int iscsit_accept_np(struct iscsi_np *, struct iscsi_conn *);
extern int iscsit_get_login_rx(struct iscsi_conn *, struct iscsi_login *); extern int iscsit_get_login_rx(struct iscsi_conn *, struct iscsi_login *);
extern int iscsit_put_login_tx(struct iscsi_conn *, struct iscsi_login *, u32); extern int iscsit_put_login_tx(struct iscsi_conn *, struct iscsi_login *, u32);

4
drivers/target/iscsi/iscsi_target_tpg.c
View File

@ -431,7 +431,7 @@ struct iscsi_tpg_np *iscsit_tpg_locate_child_np(
static bool iscsit_tpg_check_network_portal( static bool iscsit_tpg_check_network_portal(
struct iscsi_tiqn *tiqn, struct iscsi_tiqn *tiqn,
struct __kernel_sockaddr_storage *sockaddr, struct sockaddr_storage *sockaddr,
int network_transport) int network_transport)
{ {
struct iscsi_portal_group *tpg; struct iscsi_portal_group *tpg;
@ -460,7 +460,7 @@ static bool iscsit_tpg_check_network_portal(
struct iscsi_tpg_np *iscsit_tpg_add_network_portal( struct iscsi_tpg_np *iscsit_tpg_add_network_portal(
struct iscsi_portal_group *tpg, struct iscsi_portal_group *tpg,
struct __kernel_sockaddr_storage *sockaddr, struct sockaddr_storage *sockaddr,
struct iscsi_tpg_np *tpg_np_parent, struct iscsi_tpg_np *tpg_np_parent,
int network_transport) int network_transport)
{ {

2
drivers/target/iscsi/iscsi_target_tpg.h
View File

@ -22,7 +22,7 @@ extern struct iscsi_node_attrib *iscsit_tpg_get_node_attrib(struct iscsi_session
extern void iscsit_tpg_del_external_nps(struct iscsi_tpg_np *); extern void iscsit_tpg_del_external_nps(struct iscsi_tpg_np *);
extern struct iscsi_tpg_np *iscsit_tpg_locate_child_np(struct iscsi_tpg_np *, int); extern struct iscsi_tpg_np *iscsit_tpg_locate_child_np(struct iscsi_tpg_np *, int);
extern struct iscsi_tpg_np *iscsit_tpg_add_network_portal(struct iscsi_portal_group *, extern struct iscsi_tpg_np *iscsit_tpg_add_network_portal(struct iscsi_portal_group *,
struct __kernel_sockaddr_storage *, struct iscsi_tpg_np *, struct sockaddr_storage *, struct iscsi_tpg_np *,
int); int);
extern int iscsit_tpg_del_network_portal(struct iscsi_portal_group *, extern int iscsit_tpg_del_network_portal(struct iscsi_portal_group *,
struct iscsi_tpg_np *); struct iscsi_tpg_np *);

6
include/target/iscsi/iscsi_target_core.h
View File

@ -528,8 +528,8 @@ struct iscsi_conn {
u32 exp_statsn; u32 exp_statsn;
/* Per connection status sequence number */ /* Per connection status sequence number */
u32 stat_sn; u32 stat_sn;
struct __kernel_sockaddr_storage login_sockaddr; struct sockaddr_storage login_sockaddr;
struct __kernel_sockaddr_storage local_sockaddr; struct sockaddr_storage local_sockaddr;
int conn_usage_count; int conn_usage_count;
int conn_waiting_on_uc; int conn_waiting_on_uc;
atomic_t check_immediate_queue; atomic_t check_immediate_queue;
@ -779,7 +779,7 @@ struct iscsi_np {
spinlock_t np_thread_lock; spinlock_t np_thread_lock;
struct completion np_restart_comp; struct completion np_restart_comp;
struct socket *np_socket; struct socket *np_socket;
struct __kernel_sockaddr_storage np_sockaddr; struct sockaddr_storage np_sockaddr;
struct task_struct *np_thread; struct task_struct *np_thread;
struct timer_list np_login_timer; struct timer_list np_login_timer;
void *np_context; void *np_context;

2
include/target/iscsi/iscsi_target_stat.h
View File

@ -50,7 +50,7 @@ struct iscsi_login_stats {
u64 last_fail_time; /* time stamp (jiffies) */ u64 last_fail_time; /* time stamp (jiffies) */
u32 last_fail_type; u32 last_fail_type;
int last_intr_fail_ip_family; int last_intr_fail_ip_family;
struct __kernel_sockaddr_storage last_intr_fail_sockaddr; struct sockaddr_storage last_intr_fail_sockaddr;
char last_intr_fail_name[224]; char last_intr_fail_name[224];
} ____cacheline_aligned; } ____cacheline_aligned;

2
include/target/iscsi/iscsi_transport.h
View File

@ -9,7 +9,7 @@ struct iscsit_transport {
int priv_size; int priv_size;
struct module *owner; struct module *owner;
struct list_head t_node; struct list_head t_node;
int (*iscsit_setup_np)(struct iscsi_np *, struct __kernel_sockaddr_storage *); int (*iscsit_setup_np)(struct iscsi_np *, struct sockaddr_storage *);
int (*iscsit_accept_np)(struct iscsi_np *, struct iscsi_conn *); int (*iscsit_accept_np)(struct iscsi_np *, struct iscsi_conn *);
void (*iscsit_free_np)(struct iscsi_np *); void (*iscsit_free_np)(struct iscsi_np *);
void (*iscsit_wait_conn)(struct iscsi_conn *); void (*iscsit_wait_conn)(struct iscsi_conn *);