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

Commit a1f659d4 authored by Masaru Nomura's avatar Masaru Nomura Committed by Greg Kroah-Hartman
Browse files

staging: lustre: socklnd: Remove unnecessary () from return statement 



Remove unnecessary brackets from return statements in socklnd.c
to meet kernel coding style.

Signed-off-by: default avatarMasaru Nomura <massa.nomura@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a8046a28

drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c

+21 −21
Original line number Diff line number Diff line
@@ -58,10 +58,10 @@ ksocknal_ip2iface(lnet_ni_t *ni, __u32 ip) 
		iface = &net->ksnn_interfaces[i];



		if (iface->ksni_ipaddr == ip)

			return (iface);

			return iface;

	}



	return (NULL);

	return NULL;

}



ksock_route_t *
@@ -71,7 +71,7 @@ ksocknal_create_route (__u32 ipaddr, int port) 


	LIBCFS_ALLOC (route, sizeof (*route));

	if (route == NULL)

		return (NULL);

		return NULL;



	atomic_set (&route->ksnr_refcount, 1);

	route->ksnr_peer = NULL;
@@ -85,7 +85,7 @@ ksocknal_create_route (__u32 ipaddr, int port) 
	route->ksnr_conn_count = 0;

	route->ksnr_share_count = 0;



	return (route);

	return route;

}



void
@@ -197,9 +197,9 @@ ksocknal_find_peer_locked (lnet_ni_t *ni, lnet_process_id_t id) 
		CDEBUG(D_NET, "got peer [%p] -> %s (%d)\n",

		       peer, libcfs_id2str(id),

		       atomic_read(&peer->ksnp_refcount));

		return (peer);

		return peer;

	}

	return (NULL);

	return NULL;

}



ksock_peer_t *
@@ -213,7 +213,7 @@ ksocknal_find_peer (lnet_ni_t *ni, lnet_process_id_t id) 
		ksocknal_peer_addref(peer);

	read_unlock(&ksocknal_data.ksnd_global_lock);



	return (peer);

	return peer;

}



void
@@ -318,7 +318,7 @@ ksocknal_get_peer_info (lnet_ni_t *ni, int index, 
	}

 out:

	read_unlock(&ksocknal_data.ksnd_global_lock);

	return (rc);

	return rc;

}



void
@@ -506,7 +506,7 @@ ksocknal_add_peer (lnet_ni_t *ni, lnet_process_id_t id, __u32 ipaddr, int port) 


	write_unlock_bh(&ksocknal_data.ksnd_global_lock);



	return (0);

	return 0;

}



void
@@ -620,7 +620,7 @@ ksocknal_del_peer (lnet_ni_t *ni, lnet_process_id_t id, __u32 ip) 


	ksocknal_txlist_done(ni, &zombies, 1);



	return (rc);

	return rc;

}



ksock_conn_t *
@@ -652,13 +652,13 @@ ksocknal_get_conn_by_idx (lnet_ni_t *ni, int index) 
				ksocknal_conn_addref(conn);

				read_unlock(&ksocknal_data. \

						 ksnd_global_lock);

				return (conn);

				return conn;

			}

		}

	}



	read_unlock(&ksocknal_data.ksnd_global_lock);

	return (NULL);

	return NULL;

}



ksock_sched_t *
@@ -709,7 +709,7 @@ ksocknal_local_ipvec (lnet_ni_t *ni, __u32 *ipaddrs) 
	}



	read_unlock(&ksocknal_data.ksnd_global_lock);

	return (nip);

	return nip;

}



int
@@ -741,7 +741,7 @@ ksocknal_match_peerip (ksock_interface_t *iface, __u32 *ips, int nips) 
	}



	LASSERT (best >= 0);

	return (best);

	return best;

}



int
@@ -843,7 +843,7 @@ ksocknal_select_ips(ksock_peer_t *peer, __u32 *peerips, int n_peerips) 


	write_unlock_bh(global_lock);



	return (n_ips);

	return n_ips;

}



void
@@ -1705,7 +1705,7 @@ ksocknal_close_peer_conns_locked (ksock_peer_t *peer, __u32 ipaddr, int why) 
		}

	}



	return (count);

	return count;

}



int
@@ -1721,7 +1721,7 @@ ksocknal_close_conn_and_siblings (ksock_conn_t *conn, int why) 


	write_unlock_bh(&ksocknal_data.ksnd_global_lock);



	return (count);

	return count;

}



int
@@ -1762,7 +1762,7 @@ ksocknal_close_matching_conns (lnet_process_id_t id, __u32 ipaddr) 


	/* wildcards always succeed */

	if (id.nid == LNET_NID_ANY || id.pid == LNET_PID_ANY || ipaddr == 0)

		return (0);

		return 0;



	if (count == 0)

		return -ENOENT;
@@ -1933,7 +1933,7 @@ ksocknal_push (lnet_ni_t *ni, lnet_process_id_t id) 


	}



	return (rc);

	return rc;

}



int
@@ -1995,7 +1995,7 @@ ksocknal_add_interface(lnet_ni_t *ni, __u32 ipaddress, __u32 netmask) 


	write_unlock_bh(&ksocknal_data.ksnd_global_lock);



	return (rc);

	return rc;

}



void
@@ -2084,7 +2084,7 @@ ksocknal_del_interface(lnet_ni_t *ni, __u32 ipaddress) 


	write_unlock_bh(&ksocknal_data.ksnd_global_lock);



	return (rc);

	return rc;

}



int