提交 7612713f 编写于 作者: Y YOSHIFUJI Hideaki 提交者: David S. Miller

[NET] RXRPC: Fix whitespace errors.

Signed-off-by: NYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 3dcf7c5e
...@@ -163,7 +163,7 @@ int rxrpc_create_connection(struct rxrpc_transport *trans, ...@@ -163,7 +163,7 @@ int rxrpc_create_connection(struct rxrpc_transport *trans,
conn = list_entry(_p, struct rxrpc_connection, link); conn = list_entry(_p, struct rxrpc_connection, link);
if (conn->addr.sin_port == candidate->addr.sin_port && if (conn->addr.sin_port == candidate->addr.sin_port &&
conn->security_ix == candidate->security_ix && conn->security_ix == candidate->security_ix &&
conn->service_id == candidate->service_id && conn->service_id == candidate->service_id &&
conn->in_clientflag == 0) conn->in_clientflag == 0)
goto found_in_graveyard; goto found_in_graveyard;
} }
...@@ -247,13 +247,13 @@ int rxrpc_connection_lookup(struct rxrpc_peer *peer, ...@@ -247,13 +247,13 @@ int rxrpc_connection_lookup(struct rxrpc_peer *peer,
conn->in_epoch == x_epoch && conn->in_epoch == x_epoch &&
conn->conn_id == x_connid && conn->conn_id == x_connid &&
conn->security_ix == x_secix && conn->security_ix == x_secix &&
conn->service_id == x_servid && conn->service_id == x_servid &&
conn->in_clientflag == x_clflag) conn->in_clientflag == x_clflag)
goto found_active; goto found_active;
} }
read_unlock(&peer->conn_lock); read_unlock(&peer->conn_lock);
/* [uncommon case] not active /* [uncommon case] not active
* - create a candidate for a new record if an inbound connection * - create a candidate for a new record if an inbound connection
* - only examine the graveyard for an outbound connection * - only examine the graveyard for an outbound connection
*/ */
...@@ -286,7 +286,7 @@ int rxrpc_connection_lookup(struct rxrpc_peer *peer, ...@@ -286,7 +286,7 @@ int rxrpc_connection_lookup(struct rxrpc_peer *peer,
conn->in_epoch == x_epoch && conn->in_epoch == x_epoch &&
conn->conn_id == x_connid && conn->conn_id == x_connid &&
conn->security_ix == x_secix && conn->security_ix == x_secix &&
conn->service_id == x_servid && conn->service_id == x_servid &&
conn->in_clientflag == x_clflag) conn->in_clientflag == x_clflag)
goto found_active_second_chance; goto found_active_second_chance;
} }
...@@ -299,7 +299,7 @@ int rxrpc_connection_lookup(struct rxrpc_peer *peer, ...@@ -299,7 +299,7 @@ int rxrpc_connection_lookup(struct rxrpc_peer *peer,
conn->in_epoch == x_epoch && conn->in_epoch == x_epoch &&
conn->conn_id == x_connid && conn->conn_id == x_connid &&
conn->security_ix == x_secix && conn->security_ix == x_secix &&
conn->service_id == x_servid && conn->service_id == x_servid &&
conn->in_clientflag == x_clflag) conn->in_clientflag == x_clflag)
goto found_in_graveyard; goto found_in_graveyard;
} }
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
*/ */
#if 1 #if 1
#define __RXACCT_DECL(X) X #define __RXACCT_DECL(X) X
#define __RXACCT(X) do { X; } while(0) #define __RXACCT(X) do { X; } while(0)
#else #else
#define __RXACCT_DECL(X) #define __RXACCT_DECL(X)
#define __RXACCT(X) do { } while(0) #define __RXACCT(X) do { } while(0)
......
...@@ -141,7 +141,7 @@ static int rxrpc_krxiod(void *arg) ...@@ -141,7 +141,7 @@ static int rxrpc_krxiod(void *arg)
try_to_freeze(); try_to_freeze();
/* discard pending signals */ /* discard pending signals */
rxrpc_discard_my_signals(); rxrpc_discard_my_signals();
} while (!rxrpc_krxiod_die); } while (!rxrpc_krxiod_die);
......
...@@ -110,7 +110,7 @@ static int rxrpc_krxsecd(void *arg) ...@@ -110,7 +110,7 @@ static int rxrpc_krxsecd(void *arg)
try_to_freeze(); try_to_freeze();
/* discard pending signals */ /* discard pending signals */
rxrpc_discard_my_signals(); rxrpc_discard_my_signals();
} while (!die); } while (!die);
......
...@@ -146,17 +146,17 @@ __attribute__((no_instrument_function)); ...@@ -146,17 +146,17 @@ __attribute__((no_instrument_function));
void __cyg_profile_func_enter (void *this_fn, void *call_site) void __cyg_profile_func_enter (void *this_fn, void *call_site)
{ {
asm volatile(" movl %%esp,%%edi \n" asm volatile(" movl %%esp,%%edi \n"
" andl %0,%%edi \n" " andl %0,%%edi \n"
" addl %1,%%edi \n" " addl %1,%%edi \n"
" movl %%esp,%%ecx \n" " movl %%esp,%%ecx \n"
" subl %%edi,%%ecx \n" " subl %%edi,%%ecx \n"
" shrl $2,%%ecx \n" " shrl $2,%%ecx \n"
" movl $0xedededed,%%eax \n" " movl $0xedededed,%%eax \n"
" rep stosl \n" " rep stosl \n"
: :
: "i"(~(THREAD_SIZE-1)), "i"(sizeof(struct thread_info)) : "i"(~(THREAD_SIZE-1)), "i"(sizeof(struct thread_info))
: "eax", "ecx", "edi", "memory", "cc" : "eax", "ecx", "edi", "memory", "cc"
); );
} }
void __cyg_profile_func_exit(void *this_fn, void *call_site) void __cyg_profile_func_exit(void *this_fn, void *call_site)
...@@ -165,16 +165,16 @@ __attribute__((no_instrument_function)); ...@@ -165,16 +165,16 @@ __attribute__((no_instrument_function));
void __cyg_profile_func_exit(void *this_fn, void *call_site) void __cyg_profile_func_exit(void *this_fn, void *call_site)
{ {
asm volatile(" movl %%esp,%%edi \n" asm volatile(" movl %%esp,%%edi \n"
" andl %0,%%edi \n" " andl %0,%%edi \n"
" addl %1,%%edi \n" " addl %1,%%edi \n"
" movl %%esp,%%ecx \n" " movl %%esp,%%ecx \n"
" subl %%edi,%%ecx \n" " subl %%edi,%%ecx \n"
" shrl $2,%%ecx \n" " shrl $2,%%ecx \n"
" movl $0xdadadada,%%eax \n" " movl $0xdadadada,%%eax \n"
" rep stosl \n" " rep stosl \n"
: :
: "i"(~(THREAD_SIZE-1)), "i"(sizeof(struct thread_info)) : "i"(~(THREAD_SIZE-1)), "i"(sizeof(struct thread_info))
: "eax", "ecx", "edi", "memory", "cc" : "eax", "ecx", "edi", "memory", "cc"
); );
} }
#endif #endif
...@@ -27,7 +27,7 @@ int rxrpc_knet; ...@@ -27,7 +27,7 @@ int rxrpc_knet;
static struct ctl_table_header *rxrpc_sysctl = NULL; static struct ctl_table_header *rxrpc_sysctl = NULL;
static ctl_table rxrpc_sysctl_table[] = { static ctl_table rxrpc_sysctl_table[] = {
{ {
.ctl_name = 1, .ctl_name = 1,
.procname = "kdebug", .procname = "kdebug",
.data = &rxrpc_kdebug, .data = &rxrpc_kdebug,
...@@ -35,7 +35,7 @@ static ctl_table rxrpc_sysctl_table[] = { ...@@ -35,7 +35,7 @@ static ctl_table rxrpc_sysctl_table[] = {
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec .proc_handler = &proc_dointvec
}, },
{ {
.ctl_name = 2, .ctl_name = 2,
.procname = "ktrace", .procname = "ktrace",
.data = &rxrpc_ktrace, .data = &rxrpc_ktrace,
...@@ -43,7 +43,7 @@ static ctl_table rxrpc_sysctl_table[] = { ...@@ -43,7 +43,7 @@ static ctl_table rxrpc_sysctl_table[] = {
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec .proc_handler = &proc_dointvec
}, },
{ {
.ctl_name = 3, .ctl_name = 3,
.procname = "kproto", .procname = "kproto",
.data = &rxrpc_kproto, .data = &rxrpc_kproto,
...@@ -51,7 +51,7 @@ static ctl_table rxrpc_sysctl_table[] = { ...@@ -51,7 +51,7 @@ static ctl_table rxrpc_sysctl_table[] = {
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec .proc_handler = &proc_dointvec
}, },
{ {
.ctl_name = 4, .ctl_name = 4,
.procname = "knet", .procname = "knet",
.data = &rxrpc_knet, .data = &rxrpc_knet,
...@@ -59,7 +59,7 @@ static ctl_table rxrpc_sysctl_table[] = { ...@@ -59,7 +59,7 @@ static ctl_table rxrpc_sysctl_table[] = {
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec .proc_handler = &proc_dointvec
}, },
{ {
.ctl_name = 5, .ctl_name = 5,
.procname = "peertimo", .procname = "peertimo",
.data = &rxrpc_peer_timeout, .data = &rxrpc_peer_timeout,
...@@ -67,7 +67,7 @@ static ctl_table rxrpc_sysctl_table[] = { ...@@ -67,7 +67,7 @@ static ctl_table rxrpc_sysctl_table[] = {
.mode = 0644, .mode = 0644,
.proc_handler = &proc_doulongvec_minmax .proc_handler = &proc_doulongvec_minmax
}, },
{ {
.ctl_name = 6, .ctl_name = 6,
.procname = "conntimo", .procname = "conntimo",
.data = &rxrpc_conn_timeout, .data = &rxrpc_conn_timeout,
......
...@@ -330,10 +330,10 @@ static int rxrpc_incoming_msg(struct rxrpc_transport *trans, ...@@ -330,10 +330,10 @@ static int rxrpc_incoming_msg(struct rxrpc_transport *trans,
msg->state = RXRPC_MSG_RECEIVED; msg->state = RXRPC_MSG_RECEIVED;
skb_get_timestamp(pkt, &msg->stamp); skb_get_timestamp(pkt, &msg->stamp);
if (msg->stamp.tv_sec == 0) { if (msg->stamp.tv_sec == 0) {
do_gettimeofday(&msg->stamp); do_gettimeofday(&msg->stamp);
if (pkt->sk) if (pkt->sk)
sock_enable_timestamp(pkt->sk); sock_enable_timestamp(pkt->sk);
} }
msg->seq = ntohl(msg->hdr.seq); msg->seq = ntohl(msg->hdr.seq);
/* attach the packet */ /* attach the packet */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册