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>

11 files changed, 23 insertions, 23 deletions

diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index aa08606f75a2..20a0a4629456 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -3102,7 +3102,7 @@ out:
 
 static int
 isert_setup_np(struct iscsi_np *np,
-               struct __kernel_sockaddr_storage *ksockaddr)
+               struct sockaddr_storage *ksockaddr)
 {
         struct isert_np *isert_np;
         struct rdma_cm_id *isert_lid;
@@ -3124,7 +3124,7 @@ isert_setup_np(struct iscsi_np *np,
          * in iscsi_target_configfs.c code..
          */
         memcpy(&np->np_sockaddr, ksockaddr,
-               sizeof(struct __kernel_sockaddr_storage));
+               sizeof(struct sockaddr_storage));
 
         isert_lid = isert_setup_id(isert_np);
         if (IS_ERR(isert_lid)) {
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index f752235a1615..a9257a083c39 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -269,7 +269,7 @@ int iscsit_deaccess_np(struct iscsi_np *np, struct iscsi_portal_group *tpg,
 }
 
 bool iscsit_check_np_match(
-        struct __kernel_sockaddr_storage *sockaddr,
+        struct sockaddr_storage *sockaddr,
         struct iscsi_np *np,
         int network_transport)
 {
@@ -311,7 +311,7 @@ bool iscsit_check_np_match(
  * Called with mutex np_lock held
  */
 static struct iscsi_np *iscsit_get_np(
-        struct __kernel_sockaddr_storage *sockaddr,
+        struct sockaddr_storage *sockaddr,
         int network_transport)
 {
         struct iscsi_np *np;
@@ -342,7 +342,7 @@ static struct iscsi_np *iscsit_get_np(
 }
 
 struct iscsi_np *iscsit_add_np(
-        struct __kernel_sockaddr_storage *sockaddr,
+        struct sockaddr_storage *sockaddr,
         int network_transport)
 {
         struct iscsi_np *np;
@@ -3452,7 +3452,7 @@ iscsit_build_sendtargets_response(struct iscsi_cmd *cmd,
                                                 tpg_np_list) {
                                 struct iscsi_np *np = tpg_np->tpg_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)
                                         continue;
diff --git a/drivers/target/iscsi/iscsi_target.h b/drivers/target/iscsi/iscsi_target.h
index d294f030a097..4cf2c0f2ba2f 100644
--- a/drivers/target/iscsi/iscsi_target.h
+++ b/drivers/target/iscsi/iscsi_target.h
@@ -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 int iscsit_deaccess_np(struct iscsi_np *, struct iscsi_portal_group *,
                                 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);
-extern struct iscsi_np *iscsit_add_np(struct __kernel_sockaddr_storage *,
+extern struct iscsi_np *iscsit_add_np(struct sockaddr_storage *,
                                 int);
 extern int iscsit_reset_np_thread(struct iscsi_np *, struct iscsi_tpg_np *,
                                 struct iscsi_portal_group *, bool);
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index 5afa6294eda2..c7461d770d3a 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -220,7 +220,7 @@ static struct se_tpg_np *lio_target_call_addnptotpg(
         struct iscsi_portal_group *tpg;
         struct iscsi_tpg_np *tpg_np;
         char *str, *str2, *ip_str, *port_str;
-        struct __kernel_sockaddr_storage sockaddr;
+        struct sockaddr_storage sockaddr;
         struct sockaddr_in *sock_in;
         struct sockaddr_in6 *sock_in6;
         unsigned long port;
@@ -235,7 +235,7 @@ static struct se_tpg_np *lio_target_call_addnptotpg(
         memset(buf, 0, MAX_PORTAL_LEN + 1);
         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, "[");
         if (str) {
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
index b7ef6fa82fbf..fc7b79672d05 100644
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@ -877,7 +877,7 @@ static void iscsi_stop_login_thread_timer(struct iscsi_np *np)
 
 int iscsit_setup_np(
         struct iscsi_np *np,
-        struct __kernel_sockaddr_storage *sockaddr)
+        struct sockaddr_storage *sockaddr)
 {
         struct socket *sock = NULL;
         int backlog = ISCSIT_TCP_BACKLOG, ret, opt = 0, len;
@@ -916,7 +916,7 @@ int iscsit_setup_np(
          * in iscsi_target_configfs.c code..
          */
         memcpy(&np->np_sockaddr, sockaddr,
-                        sizeof(struct __kernel_sockaddr_storage));
+                        sizeof(struct sockaddr_storage));
 
         if (sockaddr->ss_family == AF_INET6)
                 len = sizeof(struct sockaddr_in6);
@@ -975,7 +975,7 @@ fail:
 
 int iscsi_target_setup_login_socket(
         struct iscsi_np *np,
-        struct __kernel_sockaddr_storage *sockaddr)
+        struct sockaddr_storage *sockaddr)
 {
         struct iscsit_transport *t;
         int rc;
diff --git a/drivers/target/iscsi/iscsi_target_login.h b/drivers/target/iscsi/iscsi_target_login.h
index 1c7358081533..35aeffee0686 100644
--- a/drivers/target/iscsi/iscsi_target_login.h
+++ b/drivers/target/iscsi/iscsi_target_login.h
@@ -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_login_post_auth_non_zero_tsih(struct iscsi_conn *, u16, u32);
 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 *,
-                                struct __kernel_sockaddr_storage *);
+                                struct sockaddr_storage *);
 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_put_login_tx(struct iscsi_conn *, struct iscsi_login *, u32);
diff --git a/drivers/target/iscsi/iscsi_target_tpg.c b/drivers/target/iscsi/iscsi_target_tpg.c
index d61ae5167c42..23c95cd14167 100644
--- a/drivers/target/iscsi/iscsi_target_tpg.c
+++ b/drivers/target/iscsi/iscsi_target_tpg.c
@@ -431,7 +431,7 @@ struct iscsi_tpg_np *iscsit_tpg_locate_child_np(
 
 static bool iscsit_tpg_check_network_portal(
         struct iscsi_tiqn *tiqn,
-        struct __kernel_sockaddr_storage *sockaddr,
+        struct sockaddr_storage *sockaddr,
         int network_transport)
 {
         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_portal_group *tpg,
-        struct __kernel_sockaddr_storage *sockaddr,
+        struct sockaddr_storage *sockaddr,
         struct iscsi_tpg_np *tpg_np_parent,
         int network_transport)
 {
diff --git a/drivers/target/iscsi/iscsi_target_tpg.h b/drivers/target/iscsi/iscsi_target_tpg.h
index 1c0b1d6605cf..9db32bd24cd4 100644
--- a/drivers/target/iscsi/iscsi_target_tpg.h
+++ b/drivers/target/iscsi/iscsi_target_tpg.h
@@ -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 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 *,
-                        struct __kernel_sockaddr_storage *, struct iscsi_tpg_np *,
+                        struct sockaddr_storage *, struct iscsi_tpg_np *,
                         int);
 extern int iscsit_tpg_del_network_portal(struct iscsi_portal_group *,
                         struct iscsi_tpg_np *);
diff --git a/include/target/iscsi/iscsi_target_core.h b/include/target/iscsi/iscsi_target_core.h
index f3eb99809557..84abe73450c5 100644
--- a/include/target/iscsi/iscsi_target_core.h
+++ b/include/target/iscsi/iscsi_target_core.h
@@ -528,8 +528,8 @@ struct iscsi_conn {
         u32                     exp_statsn;
         /* Per connection status sequence number */
         u32                     stat_sn;
-        struct __kernel_sockaddr_storage login_sockaddr;
-        struct __kernel_sockaddr_storage local_sockaddr;
+        struct sockaddr_storage login_sockaddr;
+        struct sockaddr_storage local_sockaddr;
         int                     conn_usage_count;
         int                     conn_waiting_on_uc;
         atomic_t                check_immediate_queue;
@@ -779,7 +779,7 @@ struct iscsi_np {
         spinlock_t              np_thread_lock;
         struct completion       np_restart_comp;
         struct socket           *np_socket;
-        struct __kernel_sockaddr_storage np_sockaddr;
+        struct sockaddr_storage np_sockaddr;
         struct task_struct      *np_thread;
         struct timer_list       np_login_timer;
         void                    *np_context;
diff --git a/include/target/iscsi/iscsi_target_stat.h b/include/target/iscsi/iscsi_target_stat.h
index f2a583cdf08b..e615bb485d0b 100644
--- a/include/target/iscsi/iscsi_target_stat.h
+++ b/include/target/iscsi/iscsi_target_stat.h
@@ -50,7 +50,7 @@ struct iscsi_login_stats {
         u64             last_fail_time;         /* time stamp (jiffies) */
         u32             last_fail_type;
         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];
 } ____cacheline_aligned;
 
diff --git a/include/target/iscsi/iscsi_transport.h b/include/target/iscsi/iscsi_transport.h
index e6bb166f12c2..90e37faa2ede 100644
--- a/include/target/iscsi/iscsi_transport.h
+++ b/include/target/iscsi/iscsi_transport.h
@@ -9,7 +9,7 @@ struct iscsit_transport {
         int priv_size;
         struct module *owner;
         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 *);
         void (*iscsit_free_np)(struct iscsi_np *);
         void (*iscsit_wait_conn)(struct iscsi_conn *);