Skip to content

L
linux
Commit 978b9b35 authored by Hatice ERTÜRK's avatar Hatice ERTÜRK Committed by Greg Kroah-Hartman
Browse files
Options

Staging: lustre: lnet: klnds: socklnd: Remove space after the name of that function 

Function names must be adjacent to the parenthesis opened after.That's
why remove space after the name of that function.

This Warning found with checkpatch.pl
Signed-off-by: default avatarHatice ERTURK <haticeerturk27@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cb7e9f7b
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 52 deletions
drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.c
View file @ 978b9b35
...@@ -37,24 +37,24 @@ ...@@ -37,24 +37,24 @@
#include "socklnd.h" #include "socklnd.h"
int int
ksocknal_lib_get_conn_addrs (ksock_conn_t *conn) ksocknal_lib_get_conn_addrs(ksock_conn_t *conn)
{ {
int rc = libcfs_sock_getaddr(conn->ksnc_sock, 1, int rc = libcfs_sock_getaddr(conn->ksnc_sock, 1,
&conn->ksnc_ipaddr, &conn->ksnc_ipaddr,
&conn->ksnc_port); &conn->ksnc_port);
/* Didn't need the {get,put}connsock dance to deref ksnc_sock... */ /* Didn't need the {get,put}connsock dance to deref ksnc_sock... */
LASSERT (!conn->ksnc_closing); LASSERT(!conn->ksnc_closing);
if (rc != 0) { if (rc != 0) {
CERROR ("Error %d getting sock peer IP\n", rc); CERROR("Error %d getting sock peer IP\n", rc);
return rc; return rc;
} }
rc = libcfs_sock_getaddr(conn->ksnc_sock, 0, rc = libcfs_sock_getaddr(conn->ksnc_sock, 0,
&conn->ksnc_myipaddr, NULL); &conn->ksnc_myipaddr, NULL);
if (rc != 0) { if (rc != 0) {
CERROR ("Error %d getting sock local IP\n", rc); CERROR("Error %d getting sock local IP\n", rc);
return rc; return rc;
} }
...@@ -75,7 +75,7 @@ ksocknal_lib_zc_capable(ksock_conn_t *conn) ...@@ -75,7 +75,7 @@ ksocknal_lib_zc_capable(ksock_conn_t *conn)
} }
int int
ksocknal_lib_send_iov (ksock_conn_t *conn, ksock_tx_t *tx) ksocknal_lib_send_iov(ksock_conn_t *conn, ksock_tx_t *tx)
{ {
struct socket *sock = conn->ksnc_sock; struct socket *sock = conn->ksnc_sock;
int nob; int nob;
...@@ -117,7 +117,7 @@ ksocknal_lib_send_iov (ksock_conn_t *conn, ksock_tx_t *tx) ...@@ -117,7 +117,7 @@ ksocknal_lib_send_iov (ksock_conn_t *conn, ksock_tx_t *tx)
} }
int int
ksocknal_lib_send_kiov (ksock_conn_t *conn, ksock_tx_t *tx) ksocknal_lib_send_kiov(ksock_conn_t *conn, ksock_tx_t *tx)
{ {
struct socket *sock = conn->ksnc_sock; struct socket *sock = conn->ksnc_sock;
lnet_kiov_t *kiov = tx->tx_kiov; lnet_kiov_t *kiov = tx->tx_kiov;
...@@ -125,7 +125,7 @@ ksocknal_lib_send_kiov (ksock_conn_t *conn, ksock_tx_t *tx) ...@@ -125,7 +125,7 @@ ksocknal_lib_send_kiov (ksock_conn_t *conn, ksock_tx_t *tx)
int nob; int nob;
/* Not NOOP message */ /* Not NOOP message */
LASSERT (tx->tx_lnetmsg != NULL); LASSERT(tx->tx_lnetmsg != NULL);
/* NB we can't trust socket ops to either consume our iovs /* NB we can't trust socket ops to either consume our iovs
* or leave them alone. */ * or leave them alone. */
...@@ -185,7 +185,7 @@ ksocknal_lib_send_kiov (ksock_conn_t *conn, ksock_tx_t *tx) ...@@ -185,7 +185,7 @@ ksocknal_lib_send_kiov (ksock_conn_t *conn, ksock_tx_t *tx)
} }
void void
ksocknal_lib_eager_ack (ksock_conn_t *conn) ksocknal_lib_eager_ack(ksock_conn_t *conn)
{ {
int opt = 1; int opt = 1;
struct socket *sock = conn->ksnc_sock; struct socket *sock = conn->ksnc_sock;
...@@ -196,11 +196,11 @@ ksocknal_lib_eager_ack (ksock_conn_t *conn) ...@@ -196,11 +196,11 @@ ksocknal_lib_eager_ack (ksock_conn_t *conn)
* peer. */ * peer. */
kernel_setsockopt(sock, SOL_TCP, TCP_QUICKACK, kernel_setsockopt(sock, SOL_TCP, TCP_QUICKACK,
(char *)&opt, sizeof (opt)); (char *)&opt, sizeof(opt));
} }
int int
ksocknal_lib_recv_iov (ksock_conn_t *conn) ksocknal_lib_recv_iov(ksock_conn_t *conn)
{ {
#if SOCKNAL_SINGLE_FRAG_RX #if SOCKNAL_SINGLE_FRAG_RX
struct kvec scratch; struct kvec scratch;
...@@ -223,13 +223,13 @@ ksocknal_lib_recv_iov (ksock_conn_t *conn) ...@@ -223,13 +223,13 @@ ksocknal_lib_recv_iov (ksock_conn_t *conn)
/* NB we can't trust socket ops to either consume our iovs /* NB we can't trust socket ops to either consume our iovs
* or leave them alone. */ * or leave them alone. */
LASSERT (niov > 0); LASSERT(niov > 0);
for (nob = i = 0; i < niov; i++) { for (nob = i = 0; i < niov; i++) {
scratchiov[i] = iov[i]; scratchiov[i] = iov[i];
nob += scratchiov[i].iov_len; nob += scratchiov[i].iov_len;
} }
LASSERT (nob <= conn->ksnc_rx_nob_wanted); LASSERT(nob <= conn->ksnc_rx_nob_wanted);
rc = kernel_recvmsg(conn->ksnc_sock, &msg, rc = kernel_recvmsg(conn->ksnc_sock, &msg,
scratchiov, niov, nob, MSG_DONTWAIT); scratchiov, niov, nob, MSG_DONTWAIT);
...@@ -243,7 +243,7 @@ ksocknal_lib_recv_iov (ksock_conn_t *conn) ...@@ -243,7 +243,7 @@ ksocknal_lib_recv_iov (ksock_conn_t *conn)
if (saved_csum != 0) { if (saved_csum != 0) {
/* accumulate checksum */ /* accumulate checksum */
for (i = 0, sum = rc; sum > 0; i++, sum -= fragnob) { for (i = 0, sum = rc; sum > 0; i++, sum -= fragnob) {
LASSERT (i < niov); LASSERT(i < niov);
fragnob = iov[i].iov_len; fragnob = iov[i].iov_len;
if (fragnob > sum) if (fragnob > sum)
...@@ -278,7 +278,7 @@ ksocknal_lib_kiov_vmap(lnet_kiov_t *kiov, int niov, ...@@ -278,7 +278,7 @@ ksocknal_lib_kiov_vmap(lnet_kiov_t *kiov, int niov,
if (!*ksocknal_tunables.ksnd_zc_recv || pages == NULL) if (!*ksocknal_tunables.ksnd_zc_recv || pages == NULL)
return NULL; return NULL;
LASSERT (niov <= LNET_MAX_IOV); LASSERT(niov <= LNET_MAX_IOV);
if (niov < 2 || if (niov < 2 ||
niov < *ksocknal_tunables.ksnd_zc_recv_min_nfrags) niov < *ksocknal_tunables.ksnd_zc_recv_min_nfrags)
...@@ -304,7 +304,7 @@ ksocknal_lib_kiov_vmap(lnet_kiov_t *kiov, int niov, ...@@ -304,7 +304,7 @@ ksocknal_lib_kiov_vmap(lnet_kiov_t *kiov, int niov,
} }
int int
ksocknal_lib_recv_kiov (ksock_conn_t *conn) ksocknal_lib_recv_kiov(ksock_conn_t *conn)
{ {
#if SOCKNAL_SINGLE_FRAG_RX || !SOCKNAL_RISK_KMAP_DEADLOCK #if SOCKNAL_SINGLE_FRAG_RX || !SOCKNAL_RISK_KMAP_DEADLOCK
struct kvec scratch; struct kvec scratch;
...@@ -348,14 +348,14 @@ ksocknal_lib_recv_kiov (ksock_conn_t *conn) ...@@ -348,14 +348,14 @@ ksocknal_lib_recv_kiov (ksock_conn_t *conn)
n = niov; n = niov;
} }
LASSERT (nob <= conn->ksnc_rx_nob_wanted); LASSERT(nob <= conn->ksnc_rx_nob_wanted);
rc = kernel_recvmsg(conn->ksnc_sock, &msg, rc = kernel_recvmsg(conn->ksnc_sock, &msg,
(struct kvec *)scratchiov, n, nob, MSG_DONTWAIT); (struct kvec *)scratchiov, n, nob, MSG_DONTWAIT);
if (conn->ksnc_msg.ksm_csum != 0) { if (conn->ksnc_msg.ksm_csum != 0) {
for (i = 0, sum = rc; sum > 0; i++, sum -= fragnob) { for (i = 0, sum = rc; sum > 0; i++, sum -= fragnob) {
LASSERT (i < niov); LASSERT(i < niov);
/* Dang! have to kmap again because I have nowhere to stash the /* Dang! have to kmap again because I have nowhere to stash the
* mapped address. But by doing it while the page is still * mapped address. But by doing it while the page is still
...@@ -423,7 +423,7 @@ ksocknal_lib_csum_tx(ksock_tx_t *tx) ...@@ -423,7 +423,7 @@ ksocknal_lib_csum_tx(ksock_tx_t *tx)
} }
int int
ksocknal_lib_get_conn_tunables (ksock_conn_t *conn, int *txmem, int *rxmem, int *nagle) ksocknal_lib_get_conn_tunables(ksock_conn_t *conn, int *txmem, int *rxmem, int *nagle)
{ {
struct socket *sock = conn->ksnc_sock; struct socket *sock = conn->ksnc_sock;
int len; int len;
...@@ -431,7 +431,7 @@ ksocknal_lib_get_conn_tunables (ksock_conn_t *conn, int *txmem, int *rxmem, int ...@@ -431,7 +431,7 @@ ksocknal_lib_get_conn_tunables (ksock_conn_t *conn, int *txmem, int *rxmem, int
rc = ksocknal_connsock_addref(conn); rc = ksocknal_connsock_addref(conn);
if (rc != 0) { if (rc != 0) {
LASSERT (conn->ksnc_closing); LASSERT(conn->ksnc_closing);
*txmem = *rxmem = *nagle = 0; *txmem = *rxmem = *nagle = 0;
return -ESHUTDOWN; return -ESHUTDOWN;
} }
...@@ -454,7 +454,7 @@ ksocknal_lib_get_conn_tunables (ksock_conn_t *conn, int *txmem, int *rxmem, int ...@@ -454,7 +454,7 @@ ksocknal_lib_get_conn_tunables (ksock_conn_t *conn, int *txmem, int *rxmem, int
} }
int int
ksocknal_lib_setup_sock (struct socket *sock) ksocknal_lib_setup_sock(struct socket *sock)
{ {
int rc; int rc;
int option; int option;
...@@ -473,17 +473,17 @@ ksocknal_lib_setup_sock (struct socket *sock) ...@@ -473,17 +473,17 @@ ksocknal_lib_setup_sock (struct socket *sock)
linger.l_linger = 0; linger.l_linger = 0;
rc = kernel_setsockopt(sock, SOL_SOCKET, SO_LINGER, rc = kernel_setsockopt(sock, SOL_SOCKET, SO_LINGER,
(char *)&linger, sizeof (linger)); (char *)&linger, sizeof(linger));
if (rc != 0) { if (rc != 0) {
CERROR ("Can't set SO_LINGER: %d\n", rc); CERROR("Can't set SO_LINGER: %d\n", rc);
return rc; return rc;
} }
option = -1; option = -1;
rc = kernel_setsockopt(sock, SOL_TCP, TCP_LINGER2, rc = kernel_setsockopt(sock, SOL_TCP, TCP_LINGER2,
(char *)&option, sizeof (option)); (char *)&option, sizeof(option));
if (rc != 0) { if (rc != 0) {
CERROR ("Can't set SO_LINGER2: %d\n", rc); CERROR("Can't set SO_LINGER2: %d\n", rc);
return rc; return rc;
} }
...@@ -491,9 +491,9 @@ ksocknal_lib_setup_sock (struct socket *sock) ...@@ -491,9 +491,9 @@ ksocknal_lib_setup_sock (struct socket *sock)
option = 1; option = 1;
rc = kernel_setsockopt(sock, SOL_TCP, TCP_NODELAY, rc = kernel_setsockopt(sock, SOL_TCP, TCP_NODELAY,
(char *)&option, sizeof (option)); (char *)&option, sizeof(option));
if (rc != 0) { if (rc != 0) {
CERROR ("Can't disable nagle: %d\n", rc); CERROR("Can't disable nagle: %d\n", rc);
return rc; return rc;
} }
} }
...@@ -502,7 +502,7 @@ ksocknal_lib_setup_sock (struct socket *sock) ...@@ -502,7 +502,7 @@ ksocknal_lib_setup_sock (struct socket *sock)
*ksocknal_tunables.ksnd_tx_buffer_size, *ksocknal_tunables.ksnd_tx_buffer_size,
*ksocknal_tunables.ksnd_rx_buffer_size); *ksocknal_tunables.ksnd_rx_buffer_size);
if (rc != 0) { if (rc != 0) {
CERROR ("Can't set buffer tx %d, rx %d buffers: %d\n", CERROR("Can't set buffer tx %d, rx %d buffers: %d\n",
*ksocknal_tunables.ksnd_tx_buffer_size, *ksocknal_tunables.ksnd_tx_buffer_size,
*ksocknal_tunables.ksnd_rx_buffer_size, rc); *ksocknal_tunables.ksnd_rx_buffer_size, rc);
return rc; return rc;
...@@ -519,9 +519,9 @@ ksocknal_lib_setup_sock (struct socket *sock) ...@@ -519,9 +519,9 @@ ksocknal_lib_setup_sock (struct socket *sock)
option = (do_keepalive ? 1 : 0); option = (do_keepalive ? 1 : 0);
rc = kernel_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, rc = kernel_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
(char *)&option, sizeof (option)); (char *)&option, sizeof(option));
if (rc != 0) { if (rc != 0) {
CERROR ("Can't set SO_KEEPALIVE: %d\n", rc); CERROR("Can't set SO_KEEPALIVE: %d\n", rc);
return rc; return rc;
} }
...@@ -529,23 +529,23 @@ ksocknal_lib_setup_sock (struct socket *sock) ...@@ -529,23 +529,23 @@ ksocknal_lib_setup_sock (struct socket *sock)
return 0; return 0;
rc = kernel_setsockopt(sock, SOL_TCP, TCP_KEEPIDLE, rc = kernel_setsockopt(sock, SOL_TCP, TCP_KEEPIDLE,
(char *)&keep_idle, sizeof (keep_idle)); (char *)&keep_idle, sizeof(keep_idle));
if (rc != 0) { if (rc != 0) {
CERROR ("Can't set TCP_KEEPIDLE: %d\n", rc); CERROR("Can't set TCP_KEEPIDLE: %d\n", rc);
return rc; return rc;
} }
rc = kernel_setsockopt(sock, SOL_TCP, TCP_KEEPINTVL, rc = kernel_setsockopt(sock, SOL_TCP, TCP_KEEPINTVL,
(char *)&keep_intvl, sizeof (keep_intvl)); (char *)&keep_intvl, sizeof(keep_intvl));
if (rc != 0) { if (rc != 0) {
CERROR ("Can't set TCP_KEEPINTVL: %d\n", rc); CERROR("Can't set TCP_KEEPINTVL: %d\n", rc);
return rc; return rc;
} }
rc = kernel_setsockopt(sock, SOL_TCP, TCP_KEEPCNT, rc = kernel_setsockopt(sock, SOL_TCP, TCP_KEEPCNT,
(char *)&keep_count, sizeof (keep_count)); (char *)&keep_count, sizeof(keep_count));
if (rc != 0) { if (rc != 0) {
CERROR ("Can't set TCP_KEEPCNT: %d\n", rc); CERROR("Can't set TCP_KEEPCNT: %d\n", rc);
return rc; return rc;
} }
...@@ -553,7 +553,7 @@ ksocknal_lib_setup_sock (struct socket *sock) ...@@ -553,7 +553,7 @@ ksocknal_lib_setup_sock (struct socket *sock)
} }
void void
ksocknal_lib_push_conn (ksock_conn_t *conn) ksocknal_lib_push_conn(ksock_conn_t *conn)
{ {
struct sock *sk; struct sock *sk;
struct tcp_sock *tp; struct tcp_sock *tp;
...@@ -568,29 +568,29 @@ ksocknal_lib_push_conn (ksock_conn_t *conn) ...@@ -568,29 +568,29 @@ ksocknal_lib_push_conn (ksock_conn_t *conn)
sk = conn->ksnc_sock->sk; sk = conn->ksnc_sock->sk;
tp = tcp_sk(sk); tp = tcp_sk(sk);
lock_sock (sk); lock_sock(sk);
nonagle = tp->nonagle; nonagle = tp->nonagle;
tp->nonagle = 1; tp->nonagle = 1;
release_sock (sk); release_sock(sk);
rc = kernel_setsockopt(conn->ksnc_sock, SOL_TCP, TCP_NODELAY, rc = kernel_setsockopt(conn->ksnc_sock, SOL_TCP, TCP_NODELAY,
(char *)&val, sizeof (val)); (char *)&val, sizeof(val));
LASSERT (rc == 0); LASSERT(rc == 0);
lock_sock (sk); lock_sock(sk);
tp->nonagle = nonagle; tp->nonagle = nonagle;
release_sock (sk); release_sock(sk);
ksocknal_connsock_decref(conn); ksocknal_connsock_decref(conn);
} }
extern void ksocknal_read_callback (ksock_conn_t *conn); extern void ksocknal_read_callback(ksock_conn_t *conn);
extern void ksocknal_write_callback (ksock_conn_t *conn); extern void ksocknal_write_callback(ksock_conn_t *conn);
/* /*
* socket call back in Linux * socket call back in Linux
*/ */
static void static void
ksocknal_data_ready (struct sock *sk) ksocknal_data_ready(struct sock *sk)
{ {
ksock_conn_t *conn; ksock_conn_t *conn;
...@@ -600,8 +600,8 @@ ksocknal_data_ready (struct sock *sk) ...@@ -600,8 +600,8 @@ ksocknal_data_ready (struct sock *sk)
conn = sk->sk_user_data; conn = sk->sk_user_data;
if (conn == NULL) { /* raced with ksocknal_terminate_conn */ if (conn == NULL) { /* raced with ksocknal_terminate_conn */
LASSERT (sk->sk_data_ready != &ksocknal_data_ready); LASSERT(sk->sk_data_ready != &ksocknal_data_ready);
sk->sk_data_ready (sk); sk->sk_data_ready(sk);
} else } else
ksocknal_read_callback(conn); ksocknal_read_callback(conn);
...@@ -609,7 +609,7 @@ ksocknal_data_ready (struct sock *sk) ...@@ -609,7 +609,7 @@ ksocknal_data_ready (struct sock *sk)
} }
static void static void
ksocknal_write_space (struct sock *sk) ksocknal_write_space(struct sock *sk)
{ {
ksock_conn_t *conn; ksock_conn_t *conn;
int wspace; int wspace;
...@@ -629,12 +629,12 @@ ksocknal_write_space (struct sock *sk) ...@@ -629,12 +629,12 @@ ksocknal_write_space (struct sock *sk)
" ready" : " blocked"), " ready" : " blocked"),
(conn == NULL) ? "" : (conn->ksnc_tx_scheduled ? (conn == NULL) ? "" : (conn->ksnc_tx_scheduled ?
" scheduled" : " idle"), " scheduled" : " idle"),
(conn == NULL) ? "" : (list_empty (&conn->ksnc_tx_queue) ? (conn == NULL) ? "" : (list_empty(&conn->ksnc_tx_queue) ?
" empty" : " queued")); " empty" : " queued"));
if (conn == NULL) { /* raced with ksocknal_terminate_conn */ if (conn == NULL) { /* raced with ksocknal_terminate_conn */
LASSERT (sk->sk_write_space != &ksocknal_write_space); LASSERT(sk->sk_write_space != &ksocknal_write_space);
sk->sk_write_space (sk); sk->sk_write_space(sk);
read_unlock(&ksocknal_data.ksnd_global_lock); read_unlock(&ksocknal_data.ksnd_global_lock);
return; return;
...@@ -647,7 +647,7 @@ ksocknal_write_space (struct sock *sk) ...@@ -647,7 +647,7 @@ ksocknal_write_space (struct sock *sk)
* ENOMEM check in ksocknal_transmit is race-free (think about * ENOMEM check in ksocknal_transmit is race-free (think about
* it). */ * it). */
clear_bit (SOCK_NOSPACE, &sk->sk_socket->flags); clear_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
} }
read_unlock(&ksocknal_data.ksnd_global_lock); read_unlock(&ksocknal_data.ksnd_global_lock);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7