Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bcc297e authored by Christophe Vu-Brugier's avatar Christophe Vu-Brugier Committed by Nicholas Bellinger
Browse files

target: cleanup some boolean tests 



Convert "x == true" to "x" and "x == false" to "!x".

Signed-off-by: default avatarChristophe Vu-Brugier <cvubrugier@yahoo.fr>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 9aff64e1

drivers/target/iscsi/iscsi_target.c

+5 −7
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ bool iscsit_check_np_match( 
		port = ntohs(sock_in->sin_port);

	}



	if ((ip_match == true) && (np->np_port == port) &&

	if (ip_match && (np->np_port == port) &&

	    (np->np_network_transport == network_transport))

		return true;
@@ -325,7 +325,7 @@ static struct iscsi_np *iscsit_get_np( 
		}



		match = iscsit_check_np_match(sockaddr, np, network_transport);

		if (match == true) {

		if (match) {

			/*

			 * Increment the np_exports reference count now to

			 * prevent iscsit_del_np() below from being called
@@ -1120,7 +1120,7 @@ iscsit_get_immediate_data(struct iscsi_cmd *cmd, struct iscsi_scsi_req *hdr, 
	/*

	 * Special case for Unsupported SAM WRITE Opcodes and ImmediateData=Yes.

	 */

	if (dump_payload == true)

	if (dump_payload)

		goto after_immediate_data;



	immed_ret = iscsit_handle_immediate_data(cmd, hdr,
@@ -3484,10 +3484,8 @@ static int iscsit_build_sendtargets_response(struct iscsi_cmd *cmd) 


				len = sprintf(buf, "TargetAddress="

					"%s:%hu,%hu",

					(inaddr_any == false) ?

						np->np_ip : conn->local_ip,

					(inaddr_any == false) ?

						np->np_port : conn->local_port,

					inaddr_any ? conn->local_ip : np->np_ip,

					inaddr_any ? conn->local_port : np->np_port,

					tpg->tpgt);

				len += 1;

drivers/target/iscsi/iscsi_target_login.c

+1 −1
Original line number Diff line number Diff line
@@ -1153,7 +1153,7 @@ iscsit_conn_set_transport(struct iscsi_conn *conn, struct iscsit_transport *t) 
void iscsi_target_login_sess_out(struct iscsi_conn *conn,

		struct iscsi_np *np, bool zero_tsih, bool new_sess)

{

	if (new_sess == false)

	if (!new_sess)

		goto old_sess_out;



	pr_err("iSCSI Login negotiation failed.\n");

drivers/target/iscsi/iscsi_target_nego.c

+3 −3
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ static void iscsi_target_sk_data_ready(struct sock *sk) 
	}



	rc = schedule_delayed_work(&conn->login_work, 0);

	if (rc == false) {

	if (!rc) {

		pr_debug("iscsi_target_sk_data_ready, schedule_delayed_work"

			 " got false\n");

	}
@@ -513,7 +513,7 @@ static void iscsi_target_do_login_rx(struct work_struct *work) 
	state = (tpg->tpg_state == TPG_STATE_ACTIVE);

	spin_unlock(&tpg->tpg_state_lock);



	if (state == false) {

	if (!state) {

		pr_debug("iscsi_target_do_login_rx: tpg_state != TPG_STATE_ACTIVE\n");

		iscsi_target_restore_sock_callbacks(conn);

		iscsi_target_login_drop(conn, login);
@@ -528,7 +528,7 @@ static void iscsi_target_do_login_rx(struct work_struct *work) 
		state = iscsi_target_sk_state_check(sk);

		read_unlock_bh(&sk->sk_callback_lock);



		if (state == false) {

		if (!state) {

			pr_debug("iscsi_target_do_login_rx, TCP state CLOSE\n");

			iscsi_target_restore_sock_callbacks(conn);

			iscsi_target_login_drop(conn, login);

drivers/target/iscsi/iscsi_target_parameters.c

+6 −6
Original line number Diff line number Diff line
@@ -474,10 +474,10 @@ int iscsi_set_keys_to_negotiate( 
		if (!strcmp(param->name, AUTHMETHOD)) {

			SET_PSTATE_NEGOTIATE(param);

		} else if (!strcmp(param->name, HEADERDIGEST)) {

			if (iser == false)

			if (!iser)

				SET_PSTATE_NEGOTIATE(param);

		} else if (!strcmp(param->name, DATADIGEST)) {

			if (iser == false)

			if (!iser)

				SET_PSTATE_NEGOTIATE(param);

		} else if (!strcmp(param->name, MAXCONNECTIONS)) {

			SET_PSTATE_NEGOTIATE(param);
@@ -497,7 +497,7 @@ int iscsi_set_keys_to_negotiate( 
		} else if (!strcmp(param->name, IMMEDIATEDATA)) {

			SET_PSTATE_NEGOTIATE(param);

		} else if (!strcmp(param->name, MAXRECVDATASEGMENTLENGTH)) {

			if (iser == false)

			if (!iser)

				SET_PSTATE_NEGOTIATE(param);

		} else if (!strcmp(param->name, MAXXMITDATASEGMENTLENGTH)) {

			continue;
@@ -528,13 +528,13 @@ int iscsi_set_keys_to_negotiate( 
		} else if (!strcmp(param->name, OFMARKINT)) {

			SET_PSTATE_NEGOTIATE(param);

		} else if (!strcmp(param->name, RDMAEXTENSIONS)) {

			if (iser == true)

			if (iser)

				SET_PSTATE_NEGOTIATE(param);

		} else if (!strcmp(param->name, INITIATORRECVDATASEGMENTLENGTH)) {

			if (iser == true)

			if (iser)

				SET_PSTATE_NEGOTIATE(param);

		} else if (!strcmp(param->name, TARGETRECVDATASEGMENTLENGTH)) {

			if (iser == true)

			if (iser)

				SET_PSTATE_NEGOTIATE(param);

		}

	}

drivers/target/iscsi/iscsi_target_tpg.c

+2 −2
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ static bool iscsit_tpg_check_network_portal( 


			match = iscsit_check_np_match(sockaddr, np,

						network_transport);

			if (match == true)

			if (match)

				break;

		}

		spin_unlock(&tpg->tpg_np_lock);
@@ -472,7 +472,7 @@ struct iscsi_tpg_np *iscsit_tpg_add_network_portal( 


	if (!tpg_np_parent) {

		if (iscsit_tpg_check_network_portal(tpg->tpg_tiqn, sockaddr,

				network_transport) == true) {

				network_transport)) {

			pr_err("Network Portal: %s already exists on a"

				" different TPG on %s\n", ip_str,

				tpg->tpg_tiqn->tiqn);