target/iscsi: Replace __kernel_sockaddr_storage with sockaddr_storage (13a3cf08) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/infiniband/ulp/isert/ib_isert.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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)) {

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -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;

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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);

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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) {

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -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;