Commit e767c840 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging: lustre: remove unnecessary blank lines reported by checkpatch.pl 



Remove any useless blank lines reported by checkpatch.pl
for LNet layer.

Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0eee6778

drivers/staging/lustre/include/linux/lnet/nidstr.h

+3 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ static inline char *libcfs_lnd2str(__u32 lnd) 
	return libcfs_lnd2str_r(lnd, libcfs_next_nidstring(),

				LNET_NIDSTR_SIZE);

}



int libcfs_str2lnd(const char *str);

char *libcfs_net2str_r(__u32 net, char *buf, size_t buf_size);

static inline char *libcfs_net2str(__u32 net)
@@ -76,12 +77,14 @@ static inline char *libcfs_net2str(__u32 net) 
	return libcfs_net2str_r(net, libcfs_next_nidstring(),

				LNET_NIDSTR_SIZE);

}



char *libcfs_nid2str_r(lnet_nid_t nid, char *buf, size_t buf_size);

static inline char *libcfs_nid2str(lnet_nid_t nid)

{

	return libcfs_nid2str_r(nid, libcfs_next_nidstring(),

				LNET_NIDSTR_SIZE);

}



__u32 libcfs_str2net(const char *str);

lnet_nid_t libcfs_str2nid(const char *str);

int libcfs_str2anynid(lnet_nid_t *nid, const char *str);

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

+0 −6
Original line number Diff line number Diff line
@@ -399,7 +399,6 @@ kib_peer_t *kiblnd_find_peer_locked(lnet_nid_t nid) 
	kib_peer_t *peer;



	list_for_each(tmp, peer_list) {



		peer = list_entry(tmp, kib_peer_t, ibp_list);



		LASSERT(peer->ibp_connecting > 0 || /* creating conns */
@@ -439,9 +438,7 @@ static int kiblnd_get_peer_info(lnet_ni_t *ni, int index, 
	read_lock_irqsave(&kiblnd_data.kib_global_lock, flags);



	for (i = 0; i < kiblnd_data.kib_peer_hash_size; i++) {



		list_for_each(ptmp, &kiblnd_data.kib_peers[i]) {



			peer = list_entry(ptmp, kib_peer_t, ibp_list);

			LASSERT(peer->ibp_connecting > 0 ||

				peer->ibp_accepting > 0 ||
@@ -554,7 +551,6 @@ static kib_conn_t *kiblnd_get_conn_by_idx(lnet_ni_t *ni, int index) 


	for (i = 0; i < kiblnd_data.kib_peer_hash_size; i++) {

		list_for_each(ptmp, &kiblnd_data.kib_peers[i]) {



			peer = list_entry(ptmp, kib_peer_t, ibp_list);

			LASSERT(peer->ibp_connecting > 0 ||

				peer->ibp_accepting > 0 ||
@@ -992,7 +988,6 @@ static int kiblnd_close_matching_conns(lnet_ni_t *ni, lnet_nid_t nid) 


	for (i = lo; i <= hi; i++) {

		list_for_each_safe(ptmp, pnxt, &kiblnd_data.kib_peers[i]) {



			peer = list_entry(ptmp, kib_peer_t, ibp_list);

			LASSERT(peer->ibp_connecting > 0 ||

				peer->ibp_accepting > 0 ||
@@ -1584,7 +1579,6 @@ int kiblnd_fmr_pool_map(kib_fmr_poolset_t *fps, __u64 *pages, int npages, 
		CDEBUG(D_NET, "Another thread is allocating new FMR pool, waiting for her to complete\n");

		schedule();

		goto again;



	}



	if (time_before(cfs_time_current(), fps->fps_next_retry)) {

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c

+0 −2
Original line number Diff line number Diff line
@@ -2287,7 +2287,6 @@ kiblnd_passive_connect(struct rdma_cm_id *cmid, void *priv, int priv_nob) 
			rej.ibr_why = IBLND_REJECT_RDMA_FRAGS;



		goto failed;



	}



	if (reqmsg->ibm_u.connparams.ibcp_max_msg_size > IBLND_MSG_SIZE) {
@@ -3128,7 +3127,6 @@ kiblnd_connd(void *arg) 
	spin_lock_irqsave(&kiblnd_data.kib_connd_lock, flags);



	while (!kiblnd_data.kib_shutdown) {



		dropped_lock = 0;



		if (!list_empty(&kiblnd_data.kib_connd_zombies)) {

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

+0 −6
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ ksocknal_find_peer_locked(lnet_ni_t *ni, lnet_process_id_t id) 
	ksock_peer_t *peer;



	list_for_each(tmp, peer_list) {



		peer = list_entry(tmp, ksock_peer_t, ksnp_list);



		LASSERT(!peer->ksnp_closing);
@@ -264,7 +263,6 @@ ksocknal_get_peer_info(lnet_ni_t *ni, int index, 
	read_lock(&ksocknal_data.ksnd_global_lock);



	for (i = 0; i < ksocknal_data.ksnd_peer_hash_size; i++) {



		list_for_each(ptmp, &ksocknal_data.ksnd_peers[i]) {

			peer = list_entry(ptmp, ksock_peer_t, ksnp_list);
@@ -1015,7 +1013,6 @@ ksocknal_connecting(ksock_peer_t *peer, __u32 ipaddr) 
	ksock_route_t *route;



	list_for_each_entry(route, &peer->ksnp_routes, ksnr_list) {



		if (route->ksnr_ipaddr == ipaddr)

			return route->ksnr_connecting;

	}
@@ -1787,7 +1784,6 @@ ksocknal_close_matching_conns(lnet_process_id_t id, __u32 ipaddr) 
	for (i = lo; i <= hi; i++) {

		list_for_each_safe(ptmp, pnxt,

				   &ksocknal_data.ksnd_peers[i]) {



			peer = list_entry(ptmp, ksock_peer_t, ksnp_list);



			if (!((id.nid == LNET_NID_ANY || id.nid == peer->ksnp_id.nid) &&
@@ -2330,7 +2326,6 @@ ksocknal_base_shutdown(void) 
					continue;



				for (j = 0; j < info->ksi_nthreads_max; j++) {



					sched = &info->ksi_scheds[j];

					LASSERT(list_empty(

						&sched->kss_tx_conns));
@@ -2387,7 +2382,6 @@ ksocknal_base_shutdown(void) 
static __u64

ksocknal_new_incarnation(void)

{



	/* The incarnation number is the time this module loaded and it

	 * identifies this particular instance of the socknal.

	 */

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

+0 −4
Original line number Diff line number Diff line
@@ -589,7 +589,6 @@ ksocknal_process_transmit (ksock_conn_t *conn, ksock_tx_t *tx) 
static void

ksocknal_launch_connection_locked (ksock_route_t *route)

{



	/* called holding write lock on ksnd_global_lock */



	LASSERT(!route->ksnr_scheduled);
@@ -2147,7 +2146,6 @@ ksocknal_connd_get_route_locked(signed long *timeout_p) 
	/* connd_routes can contain both pending and ordinary routes */

	list_for_each_entry(route, &ksocknal_data.ksnd_connd_routes,

			    ksnr_connd_list) {



		if (route->ksnr_retry_interval == 0 ||

		    cfs_time_aftereq(now, route->ksnr_timeout))

			return route;
@@ -2495,7 +2493,6 @@ ksocknal_check_peer_timeouts (int idx) 


			if (cfs_time_aftereq(cfs_time_current(),

					     tx->tx_deadline)) {



				ksocknal_peer_addref(peer);

				read_unlock(&ksocknal_data.ksnd_global_lock);
@@ -2569,7 +2566,6 @@ ksocknal_reaper (void *arg) 
	spin_lock_bh(&ksocknal_data.ksnd_reaper_lock);



	while (!ksocknal_data.ksnd_shuttingdown) {



		if (!list_empty (&ksocknal_data.ksnd_deathrow_conns)) {

			conn = list_entry (ksocknal_data. \

					       ksnd_deathrow_conns.next,