diff options
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/cluster/tcp.c | 15 | ||||
-rw-r--r-- | fs/ocfs2/cluster/tcp_internal.h | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index eb649d23a4de..d857534b886e 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c | |||
@@ -137,7 +137,7 @@ static int o2net_sys_err_translations[O2NET_ERR_MAX] = | |||
137 | static void o2net_sc_connect_completed(struct work_struct *work); | 137 | static void o2net_sc_connect_completed(struct work_struct *work); |
138 | static void o2net_rx_until_empty(struct work_struct *work); | 138 | static void o2net_rx_until_empty(struct work_struct *work); |
139 | static void o2net_shutdown_sc(struct work_struct *work); | 139 | static void o2net_shutdown_sc(struct work_struct *work); |
140 | static void o2net_listen_data_ready(struct sock *sk, int bytes); | 140 | static void o2net_listen_data_ready(struct sock *sk); |
141 | static void o2net_sc_send_keep_req(struct work_struct *work); | 141 | static void o2net_sc_send_keep_req(struct work_struct *work); |
142 | static void o2net_idle_timer(unsigned long data); | 142 | static void o2net_idle_timer(unsigned long data); |
143 | static void o2net_sc_postpone_idle(struct o2net_sock_container *sc); | 143 | static void o2net_sc_postpone_idle(struct o2net_sock_container *sc); |
@@ -597,9 +597,9 @@ static void o2net_set_nn_state(struct o2net_node *nn, | |||
597 | } | 597 | } |
598 | 598 | ||
599 | /* see o2net_register_callbacks() */ | 599 | /* see o2net_register_callbacks() */ |
600 | static void o2net_data_ready(struct sock *sk, int bytes) | 600 | static void o2net_data_ready(struct sock *sk) |
601 | { | 601 | { |
602 | void (*ready)(struct sock *sk, int bytes); | 602 | void (*ready)(struct sock *sk); |
603 | 603 | ||
604 | read_lock(&sk->sk_callback_lock); | 604 | read_lock(&sk->sk_callback_lock); |
605 | if (sk->sk_user_data) { | 605 | if (sk->sk_user_data) { |
@@ -613,7 +613,7 @@ static void o2net_data_ready(struct sock *sk, int bytes) | |||
613 | } | 613 | } |
614 | read_unlock(&sk->sk_callback_lock); | 614 | read_unlock(&sk->sk_callback_lock); |
615 | 615 | ||
616 | ready(sk, bytes); | 616 | ready(sk); |
617 | } | 617 | } |
618 | 618 | ||
619 | /* see o2net_register_callbacks() */ | 619 | /* see o2net_register_callbacks() */ |
@@ -1953,9 +1953,9 @@ static void o2net_accept_many(struct work_struct *work) | |||
1953 | cond_resched(); | 1953 | cond_resched(); |
1954 | } | 1954 | } |
1955 | 1955 | ||
1956 | static void o2net_listen_data_ready(struct sock *sk, int bytes) | 1956 | static void o2net_listen_data_ready(struct sock *sk) |
1957 | { | 1957 | { |
1958 | void (*ready)(struct sock *sk, int bytes); | 1958 | void (*ready)(struct sock *sk); |
1959 | 1959 | ||
1960 | read_lock(&sk->sk_callback_lock); | 1960 | read_lock(&sk->sk_callback_lock); |
1961 | ready = sk->sk_user_data; | 1961 | ready = sk->sk_user_data; |
@@ -1978,7 +1978,6 @@ static void o2net_listen_data_ready(struct sock *sk, int bytes) | |||
1978 | */ | 1978 | */ |
1979 | 1979 | ||
1980 | if (sk->sk_state == TCP_LISTEN) { | 1980 | if (sk->sk_state == TCP_LISTEN) { |
1981 | mlog(ML_TCP, "bytes: %d\n", bytes); | ||
1982 | queue_work(o2net_wq, &o2net_listen_work); | 1981 | queue_work(o2net_wq, &o2net_listen_work); |
1983 | } else { | 1982 | } else { |
1984 | ready = NULL; | 1983 | ready = NULL; |
@@ -1987,7 +1986,7 @@ static void o2net_listen_data_ready(struct sock *sk, int bytes) | |||
1987 | out: | 1986 | out: |
1988 | read_unlock(&sk->sk_callback_lock); | 1987 | read_unlock(&sk->sk_callback_lock); |
1989 | if (ready != NULL) | 1988 | if (ready != NULL) |
1990 | ready(sk, bytes); | 1989 | ready(sk); |
1991 | } | 1990 | } |
1992 | 1991 | ||
1993 | static int o2net_open_listening_sock(__be32 addr, __be16 port) | 1992 | static int o2net_open_listening_sock(__be32 addr, __be16 port) |
diff --git a/fs/ocfs2/cluster/tcp_internal.h b/fs/ocfs2/cluster/tcp_internal.h index 4cbcb65784a3..dc024367110a 100644 --- a/fs/ocfs2/cluster/tcp_internal.h +++ b/fs/ocfs2/cluster/tcp_internal.h | |||
@@ -165,7 +165,7 @@ struct o2net_sock_container { | |||
165 | 165 | ||
166 | /* original handlers for the sockets */ | 166 | /* original handlers for the sockets */ |
167 | void (*sc_state_change)(struct sock *sk); | 167 | void (*sc_state_change)(struct sock *sk); |
168 | void (*sc_data_ready)(struct sock *sk, int bytes); | 168 | void (*sc_data_ready)(struct sock *sk); |
169 | 169 | ||
170 | u32 sc_msg_key; | 170 | u32 sc_msg_key; |
171 | u16 sc_msg_type; | 171 | u16 sc_msg_type; |