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

staging: lustre: balance braces properly in LNet layer 



Properly balance the braces done wrong as reported by
checkpatch.pl.

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

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

+2 −1
Original line number Diff line number Diff line
@@ -951,8 +951,9 @@ kiblnd_check_sends(kib_conn_t *conn) 
			credit = 1;

			tx = list_entry(conn->ibc_tx_queue.next,

					kib_tx_t, tx_list);

		} else

		} else {

			break;

		}



		if (kiblnd_post_tx_locked(conn, tx, credit) != 0)

			break;

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

+2 −1
Original line number Diff line number Diff line
@@ -609,8 +609,9 @@ ksocknal_data_ready(struct sock *sk) 
	if (conn == NULL) {	     /* raced with ksocknal_terminate_conn */

		LASSERT(sk->sk_data_ready != &ksocknal_data_ready);

		sk->sk_data_ready(sk);

	} else

	} else {

		ksocknal_read_callback(conn);

	}



	read_unlock(&ksocknal_data.ksnd_global_lock);

}

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

+1 −2
Original line number Diff line number Diff line
@@ -507,9 +507,8 @@ ksocknal_send_hello_v1(ksock_conn_t *conn, ksock_hello_msg_t *hello) 
	if (hello->kshm_nips == 0)

		goto out;



	for (i = 0; i < (int) hello->kshm_nips; i++) {

	for (i = 0; i < (int) hello->kshm_nips; i++)

		hello->kshm_ips[i] = __cpu_to_le32(hello->kshm_ips[i]);

	}



	rc = lnet_sock_write(sock, hello->kshm_ips,

			     hello->kshm_nips * sizeof(__u32),

drivers/staging/lustre/lnet/lnet/nidstrings.c

+2 −2
Original line number Diff line number Diff line
@@ -1139,9 +1139,9 @@ libcfs_nid2str_r(lnet_nid_t nid, char *buf, size_t buf_size) 
	}



	nf = libcfs_lnd2netstrfns(lnd);

	if (nf == NULL)

	if (nf == NULL) {

		snprintf(buf, buf_size, "%x@<%u:%u>", addr, lnd, nnum);

	else {

	} else {

		size_t addr_len;



		nf->nf_addr2str(addr, buf, buf_size);

drivers/staging/lustre/lnet/lnet/router_proc.c

+4 −4
Original line number Diff line number Diff line
@@ -262,9 +262,9 @@ static int proc_lnet_routes(struct ctl_table *table, int write, 
	if (len > *lenp) {    /* linux-supplied buffer is too small */

		rc = -EINVAL;

	} else if (len > 0) { /* wrote something */

		if (copy_to_user(buffer, tmpstr, len))

		if (copy_to_user(buffer, tmpstr, len)) {

			rc = -EFAULT;

		else {

		} else {

			off += 1;

			*ppos = LNET_PROC_POS_MAKE(0, ver, 0, off);

		}
@@ -399,9 +399,9 @@ static int proc_lnet_routers(struct ctl_table *table, int write, 
	if (len > *lenp) {    /* linux-supplied buffer is too small */

		rc = -EINVAL;

	} else if (len > 0) { /* wrote something */

		if (copy_to_user(buffer, tmpstr, len))

		if (copy_to_user(buffer, tmpstr, len)) {

			rc = -EFAULT;

		else {

		} else {

			off += 1;

			*ppos = LNET_PROC_POS_MAKE(0, ver, 0, off);

		}