AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: lustre: balance braces properly in LNet layer

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

Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
James Simmons 2016-02-12 12:06:07 -05:00 committed by Greg Kroah-Hartman
parent b31e64c4a1
commit 06f2f2f2bb
7 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
View File

@ -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;

3
drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c
View File

@ -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);
}

3
drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c
View File

@ -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),

4
drivers/staging/lustre/lnet/lnet/nidstrings.c
View File

@ -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);

8
drivers/staging/lustre/lnet/lnet/router_proc.c
View File

@ -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);
}

6
drivers/staging/lustre/lnet/selftest/console.c
View File

@ -254,9 +254,8 @@ lstcon_group_decref(lstcon_group_t *grp)
lstcon_group_drain(grp, 0);
for (i = 0; i < LST_NODE_HASHSIZE; i++) {
for (i = 0; i < LST_NODE_HASHSIZE; i++)
LASSERT(list_empty(&grp->grp_ndl_hash[i]));
}
LIBCFS_FREE(grp, offsetof(lstcon_group_t,
grp_ndl_hash[LST_NODE_HASHSIZE]));
@ -2084,9 +2083,8 @@ lstcon_console_fini(void)
LASSERT(list_empty(&console_session.ses_bat_list));
LASSERT(list_empty(&console_session.ses_trans_list));
for (i = 0; i < LST_NODE_HASHSIZE; i++) {
for (i = 0; i < LST_NODE_HASHSIZE; i++)
LASSERT(list_empty(&console_session.ses_ndl_hash[i]));
}
LIBCFS_FREE(console_session.ses_ndl_hash,
sizeof(struct list_head) * LST_GLOBAL_HASHSIZE);

5
drivers/staging/lustre/lnet/selftest/selftest.h
View File

@ -508,11 +508,10 @@ srpc_destroy_client_rpc(srpc_client_rpc_t *rpc)
LASSERT(!srpc_event_pending(rpc));
LASSERT(atomic_read(&rpc->crpc_refcount) == 0);
if (rpc->crpc_fini == NULL) {
if (rpc->crpc_fini == NULL)
LIBCFS_FREE(rpc, srpc_client_rpc_size(rpc));
} else {
else
(*rpc->crpc_fini) (rpc);
}
return;
}