[NET] RXRPC: Fix whitespace errors.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
author: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> 2007-02-09 09:25:14 -0500
committer: David S. Miller <davem@sunset.davemloft.net> 2007-02-11 02:20:07 -0500
commit: 7612713fb69a17b79ca7d757df4446700f4afe6c (patch)
tree: 36732eeddf2d7e59343afe94c0432db3798d756b
parent: 3dcf7c5e8b92387e0c63b3c75757fee1991f78f8 (diff)
7 files changed, 39 insertions, 39 deletions
diff --git a/net/rxrpc/connection.c b/net/rxrpc/connection.c
index 93d2c55ad2d5..a7c929a9fdca 100644
--- a/net/rxrpc/connection.c
+++ b/net/rxrpc/connection.c
@@ -163,7 +163,7 @@ int rxrpc_create_connection(struct rxrpc_transport *trans,
                conn = list_entry(_p, struct rxrpc_connection, link);
                if (conn->addr.sin_port == candidate->addr.sin_port     &&
                    conn->security_ix   == candidate->security_ix       &&
-                    conn->service_id    == candidate->service_id        && 
+                    conn->service_id    == candidate->service_id        &&
                    conn->in_clientflag == 0)
                        goto found_in_graveyard;
        }
@@ -247,13 +247,13 @@ int rxrpc_connection_lookup(struct rxrpc_peer *peer,
                    conn->in_epoch              == x_epoch      &&
                    conn->conn_id               == x_connid     &&
                    conn->security_ix           == x_secix      &&
-                    conn->service_id            == x_servid     && 
+                    conn->service_id            == x_servid     &&
                    conn->in_clientflag         == x_clflag)
                        goto found_active;
        }
        read_unlock(&peer->conn_lock);
-        /* [uncommon case] not active 
+        /* [uncommon case] not active
         * - create a candidate for a new record if an inbound connection
         * - only examine the graveyard for an outbound connection
         */
@@ -286,7 +286,7 @@ int rxrpc_connection_lookup(struct rxrpc_peer *peer,
                    conn->in_epoch              == x_epoch      &&
                    conn->conn_id               == x_connid     &&
                    conn->security_ix           == x_secix      &&
-                    conn->service_id            == x_servid     && 
+                    conn->service_id            == x_servid     &&
                    conn->in_clientflag         == x_clflag)
                        goto found_active_second_chance;
        }
@@ -299,7 +299,7 @@ int rxrpc_connection_lookup(struct rxrpc_peer *peer,
                    conn->in_epoch              == x_epoch      &&
                    conn->conn_id               == x_connid     &&
                    conn->security_ix           == x_secix      &&
-                    conn->service_id            == x_servid     && 
+                    conn->service_id            == x_servid     &&
                    conn->in_clientflag         == x_clflag)
                        goto found_in_graveyard;
        }
diff --git a/net/rxrpc/internal.h b/net/rxrpc/internal.h
index 70e52f6b0b64..cc0c5795a103 100644
--- a/net/rxrpc/internal.h
+++ b/net/rxrpc/internal.h
@@ -14,7 +14,7 @@
 */
 #if 1
 #define __RXACCT_DECL(X) X
-#define __RXACCT(X) do { X; } while(0) 
+#define __RXACCT(X) do { X; } while(0)
 #else
 #define __RXACCT_DECL(X)
 #define __RXACCT(X) do { } while(0)
diff --git a/net/rxrpc/krxiod.c b/net/rxrpc/krxiod.c
index 49effd92144e..bbbcd6c24048 100644
--- a/net/rxrpc/krxiod.c
+++ b/net/rxrpc/krxiod.c
@@ -141,7 +141,7 @@ static int rxrpc_krxiod(void *arg)
                try_to_freeze();
-                /* discard pending signals */
+                /* discard pending signals */
                rxrpc_discard_my_signals();
        } while (!rxrpc_krxiod_die);
diff --git a/net/rxrpc/krxsecd.c b/net/rxrpc/krxsecd.c
index 3ab0f77409f4..9a1e7f5e034c 100644
--- a/net/rxrpc/krxsecd.c
+++ b/net/rxrpc/krxsecd.c
@@ -110,7 +110,7 @@ static int rxrpc_krxsecd(void *arg)
                try_to_freeze();
-                /* discard pending signals */
+                /* discard pending signals */
                rxrpc_discard_my_signals();
        } while (!die);
diff --git a/net/rxrpc/main.c b/net/rxrpc/main.c
index 48cbd065bb45..baec1f7fd8b9 100644
--- a/net/rxrpc/main.c
+++ b/net/rxrpc/main.c
@@ -146,17 +146,17 @@ __attribute__((no_instrument_function));
 void __cyg_profile_func_enter (void *this_fn, void *call_site)
 {
       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)
@@ -165,16 +165,16 @@ __attribute__((no_instrument_function));
 void __cyg_profile_func_exit(void *this_fn, void *call_site)
 {
       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
diff --git a/net/rxrpc/sysctl.c b/net/rxrpc/sysctl.c
index 6374df7e77d1..0755ae028e43 100644
--- a/net/rxrpc/sysctl.c
+++ b/net/rxrpc/sysctl.c
@@ -27,7 +27,7 @@ int rxrpc_knet;
 static struct ctl_table_header *rxrpc_sysctl = NULL;
 static ctl_table rxrpc_sysctl_table[] = {
-        {
+        {
                .ctl_name       = 1,
                .procname       = "kdebug",
                .data           = &rxrpc_kdebug,
@@ -35,7 +35,7 @@ static ctl_table rxrpc_sysctl_table[] = {
                .mode           = 0644,
                .proc_handler   = &proc_dointvec
        },
-        {
+        {
                .ctl_name       = 2,
                .procname       = "ktrace",
                .data           = &rxrpc_ktrace,
@@ -43,7 +43,7 @@ static ctl_table rxrpc_sysctl_table[] = {
                .mode           = 0644,
                .proc_handler   = &proc_dointvec
        },
-        {
+        {
                .ctl_name       = 3,
                .procname       = "kproto",
                .data           = &rxrpc_kproto,
@@ -51,7 +51,7 @@ static ctl_table rxrpc_sysctl_table[] = {
                .mode           = 0644,
                .proc_handler   = &proc_dointvec
        },
-        {
+        {
                .ctl_name       = 4,
                .procname       = "knet",
                .data           = &rxrpc_knet,
@@ -59,7 +59,7 @@ static ctl_table rxrpc_sysctl_table[] = {
                .mode           = 0644,
                .proc_handler   = &proc_dointvec
        },
-        {
+        {
                .ctl_name       = 5,
                .procname       = "peertimo",
                .data           = &rxrpc_peer_timeout,
@@ -67,7 +67,7 @@ static ctl_table rxrpc_sysctl_table[] = {
                .mode           = 0644,
                .proc_handler   = &proc_doulongvec_minmax
        },
-        {
+        {
                .ctl_name       = 6,
                .procname       = "conntimo",
                .data           = &rxrpc_conn_timeout,
diff --git a/net/rxrpc/transport.c b/net/rxrpc/transport.c
index 4268b38d92d2..ff5f4f333086 100644
--- a/net/rxrpc/transport.c
+++ b/net/rxrpc/transport.c
@@ -330,10 +330,10 @@ static int rxrpc_incoming_msg(struct rxrpc_transport *trans,
        msg->state = RXRPC_MSG_RECEIVED;
        skb_get_timestamp(pkt, &msg->stamp);
        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);
-        } 
+        }
        msg->seq = ntohl(msg->hdr.seq);
        /* attach the packet */
author	YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>	2007-02-09 09:25:14 -0500
committer	David S. Miller <davem@sunset.davemloft.net>	2007-02-11 02:20:07 -0500
commit	7612713fb69a17b79ca7d757df4446700f4afe6c (patch)
tree	36732eeddf2d7e59343afe94c0432db3798d756b
parent	3dcf7c5e8b92387e0c63b3c75757fee1991f78f8 (diff)

diff --git a/net/rxrpc/connection.c b/net/rxrpc/connection.c index 93d2c55ad2d5..a7c929a9fdca 100644 --- a/net/rxrpc/connection.c +++ b/net/rxrpc/connection.c
@@ -163,7 +163,7 @@ int rxrpc_create_connection(struct rxrpc_transport *trans,
163	conn = list_entry(_p, struct rxrpc_connection, link);	163	conn = list_entry(_p, struct rxrpc_connection, link);
164	if (conn->addr.sin_port == candidate->addr.sin_port &&	164	if (conn->addr.sin_port == candidate->addr.sin_port &&
165	conn->security_ix == candidate->security_ix &&	165	conn->security_ix == candidate->security_ix &&
166	conn->service_id == candidate->service_id &&	166	conn->service_id == candidate->service_id &&
167	conn->in_clientflag == 0)	167	conn->in_clientflag == 0)
168	goto found_in_graveyard;	168	goto found_in_graveyard;
169	}	169	}
@@ -247,13 +247,13 @@ int rxrpc_connection_lookup(struct rxrpc_peer *peer,
247	conn->in_epoch == x_epoch &&	247	conn->in_epoch == x_epoch &&
248	conn->conn_id == x_connid &&	248	conn->conn_id == x_connid &&
249	conn->security_ix == x_secix &&	249	conn->security_ix == x_secix &&
250	conn->service_id == x_servid &&	250	conn->service_id == x_servid &&
251	conn->in_clientflag == x_clflag)	251	conn->in_clientflag == x_clflag)
252	goto found_active;	252	goto found_active;
253	}	253	}
254	read_unlock(&peer->conn_lock);	254	read_unlock(&peer->conn_lock);
255		255
256	/* [uncommon case] not active	256	/* [uncommon case] not active
257	* - create a candidate for a new record if an inbound connection	257	* - create a candidate for a new record if an inbound connection
258	* - only examine the graveyard for an outbound connection	258	* - only examine the graveyard for an outbound connection
259	*/	259	*/
@@ -286,7 +286,7 @@ int rxrpc_connection_lookup(struct rxrpc_peer *peer,
286	conn->in_epoch == x_epoch &&	286	conn->in_epoch == x_epoch &&
287	conn->conn_id == x_connid &&	287	conn->conn_id == x_connid &&
288	conn->security_ix == x_secix &&	288	conn->security_ix == x_secix &&
289	conn->service_id == x_servid &&	289	conn->service_id == x_servid &&
290	conn->in_clientflag == x_clflag)	290	conn->in_clientflag == x_clflag)
291	goto found_active_second_chance;	291	goto found_active_second_chance;
292	}	292	}
@@ -299,7 +299,7 @@ int rxrpc_connection_lookup(struct rxrpc_peer *peer,
299	conn->in_epoch == x_epoch &&	299	conn->in_epoch == x_epoch &&
300	conn->conn_id == x_connid &&	300	conn->conn_id == x_connid &&
301	conn->security_ix == x_secix &&	301	conn->security_ix == x_secix &&
302	conn->service_id == x_servid &&	302	conn->service_id == x_servid &&
303	conn->in_clientflag == x_clflag)	303	conn->in_clientflag == x_clflag)
304	goto found_in_graveyard;	304	goto found_in_graveyard;
305	}	305	}


diff --git a/net/rxrpc/internal.h b/net/rxrpc/internal.h index 70e52f6b0b64..cc0c5795a103 100644 --- a/net/rxrpc/internal.h +++ b/net/rxrpc/internal.h
@@ -14,7 +14,7 @@
14	*/	14	*/
15	#if 1	15	#if 1
16	#define __RXACCT_DECL(X) X	16	#define __RXACCT_DECL(X) X
17	#define __RXACCT(X) do { X; } while(0)	17	#define __RXACCT(X) do { X; } while(0)
18	#else	18	#else
19	#define __RXACCT_DECL(X)	19	#define __RXACCT_DECL(X)
20	#define __RXACCT(X) do { } while(0)	20	#define __RXACCT(X) do { } while(0)


diff --git a/net/rxrpc/krxiod.c b/net/rxrpc/krxiod.c index 49effd92144e..bbbcd6c24048 100644 --- a/net/rxrpc/krxiod.c +++ b/net/rxrpc/krxiod.c
@@ -141,7 +141,7 @@ static int rxrpc_krxiod(void *arg)
141		141
142	try_to_freeze();	142	try_to_freeze();
143		143
144	/* discard pending signals */	144	/* discard pending signals */
145	rxrpc_discard_my_signals();	145	rxrpc_discard_my_signals();
146		146
147	} while (!rxrpc_krxiod_die);	147	} while (!rxrpc_krxiod_die);


diff --git a/net/rxrpc/krxsecd.c b/net/rxrpc/krxsecd.c index 3ab0f77409f4..9a1e7f5e034c 100644 --- a/net/rxrpc/krxsecd.c +++ b/net/rxrpc/krxsecd.c
@@ -110,7 +110,7 @@ static int rxrpc_krxsecd(void *arg)
110		110
111	try_to_freeze();	111	try_to_freeze();
112		112
113	/* discard pending signals */	113	/* discard pending signals */
114	rxrpc_discard_my_signals();	114	rxrpc_discard_my_signals();
115		115
116	} while (!die);	116	} while (!die);


diff --git a/net/rxrpc/main.c b/net/rxrpc/main.c index 48cbd065bb45..baec1f7fd8b9 100644 --- a/net/rxrpc/main.c +++ b/net/rxrpc/main.c
@@ -146,17 +146,17 @@ __attribute__((no_instrument_function));
146	void __cyg_profile_func_enter (void this_fn, void call_site)	146	void __cyg_profile_func_enter (void this_fn, void call_site)
147	{	147	{
148	asm volatile(" movl %%esp,%%edi \n"	148	asm volatile(" movl %%esp,%%edi \n"
149	" andl %0,%%edi \n"	149	" andl %0,%%edi \n"
150	" addl %1,%%edi \n"	150	" addl %1,%%edi \n"
151	" movl %%esp,%%ecx \n"	151	" movl %%esp,%%ecx \n"
152	" subl %%edi,%%ecx \n"	152	" subl %%edi,%%ecx \n"
153	" shrl $2,%%ecx \n"	153	" shrl $2,%%ecx \n"
154	" movl $0xedededed,%%eax \n"	154	" movl $0xedededed,%%eax \n"
155	" rep stosl \n"	155	" rep stosl \n"
156	:	156	:
157	: "i"(~(THREAD_SIZE-1)), "i"(sizeof(struct thread_info))	157	: "i"(~(THREAD_SIZE-1)), "i"(sizeof(struct thread_info))
158	: "eax", "ecx", "edi", "memory", "cc"	158	: "eax", "ecx", "edi", "memory", "cc"
159	);	159	);
160	}	160	}
161		161
162	void __cyg_profile_func_exit(void this_fn, void call_site)	162	void __cyg_profile_func_exit(void this_fn, void call_site)
@@ -165,16 +165,16 @@ __attribute__((no_instrument_function));
165	void __cyg_profile_func_exit(void this_fn, void call_site)	165	void __cyg_profile_func_exit(void this_fn, void call_site)
166	{	166	{
167	asm volatile(" movl %%esp,%%edi \n"	167	asm volatile(" movl %%esp,%%edi \n"
168	" andl %0,%%edi \n"	168	" andl %0,%%edi \n"
169	" addl %1,%%edi \n"	169	" addl %1,%%edi \n"
170	" movl %%esp,%%ecx \n"	170	" movl %%esp,%%ecx \n"
171	" subl %%edi,%%ecx \n"	171	" subl %%edi,%%ecx \n"
172	" shrl $2,%%ecx \n"	172	" shrl $2,%%ecx \n"
173	" movl $0xdadadada,%%eax \n"	173	" movl $0xdadadada,%%eax \n"
174	" rep stosl \n"	174	" rep stosl \n"
175	:	175	:
176	: "i"(~(THREAD_SIZE-1)), "i"(sizeof(struct thread_info))	176	: "i"(~(THREAD_SIZE-1)), "i"(sizeof(struct thread_info))
177	: "eax", "ecx", "edi", "memory", "cc"	177	: "eax", "ecx", "edi", "memory", "cc"
178	);	178	);
179	}	179	}
180	#endif	180	#endif


diff --git a/net/rxrpc/sysctl.c b/net/rxrpc/sysctl.c index 6374df7e77d1..0755ae028e43 100644 --- a/net/rxrpc/sysctl.c +++ b/net/rxrpc/sysctl.c
@@ -27,7 +27,7 @@ int rxrpc_knet;
27	static struct ctl_table_header *rxrpc_sysctl = NULL;	27	static struct ctl_table_header *rxrpc_sysctl = NULL;
28		28
29	static ctl_table rxrpc_sysctl_table[] = {	29	static ctl_table rxrpc_sysctl_table[] = {
30	{	30	{
31	.ctl_name = 1,	31	.ctl_name = 1,
32	.procname = "kdebug",	32	.procname = "kdebug",
33	.data = &rxrpc_kdebug,	33	.data = &rxrpc_kdebug,
@@ -35,7 +35,7 @@ static ctl_table rxrpc_sysctl_table[] = {
35	.mode = 0644,	35	.mode = 0644,
36	.proc_handler = &proc_dointvec	36	.proc_handler = &proc_dointvec
37	},	37	},
38	{	38	{
39	.ctl_name = 2,	39	.ctl_name = 2,
40	.procname = "ktrace",	40	.procname = "ktrace",
41	.data = &rxrpc_ktrace,	41	.data = &rxrpc_ktrace,
@@ -43,7 +43,7 @@ static ctl_table rxrpc_sysctl_table[] = {
43	.mode = 0644,	43	.mode = 0644,
44	.proc_handler = &proc_dointvec	44	.proc_handler = &proc_dointvec
45	},	45	},
46	{	46	{
47	.ctl_name = 3,	47	.ctl_name = 3,
48	.procname = "kproto",	48	.procname = "kproto",
49	.data = &rxrpc_kproto,	49	.data = &rxrpc_kproto,
@@ -51,7 +51,7 @@ static ctl_table rxrpc_sysctl_table[] = {
51	.mode = 0644,	51	.mode = 0644,
52	.proc_handler = &proc_dointvec	52	.proc_handler = &proc_dointvec
53	},	53	},
54	{	54	{
55	.ctl_name = 4,	55	.ctl_name = 4,
56	.procname = "knet",	56	.procname = "knet",
57	.data = &rxrpc_knet,	57	.data = &rxrpc_knet,
@@ -59,7 +59,7 @@ static ctl_table rxrpc_sysctl_table[] = {
59	.mode = 0644,	59	.mode = 0644,
60	.proc_handler = &proc_dointvec	60	.proc_handler = &proc_dointvec
61	},	61	},
62	{	62	{
63	.ctl_name = 5,	63	.ctl_name = 5,
64	.procname = "peertimo",	64	.procname = "peertimo",
65	.data = &rxrpc_peer_timeout,	65	.data = &rxrpc_peer_timeout,
@@ -67,7 +67,7 @@ static ctl_table rxrpc_sysctl_table[] = {
67	.mode = 0644,	67	.mode = 0644,
68	.proc_handler = &proc_doulongvec_minmax	68	.proc_handler = &proc_doulongvec_minmax
69	},	69	},
70	{	70	{
71	.ctl_name = 6,	71	.ctl_name = 6,
72	.procname = "conntimo",	72	.procname = "conntimo",
73	.data = &rxrpc_conn_timeout,	73	.data = &rxrpc_conn_timeout,


diff --git a/net/rxrpc/transport.c b/net/rxrpc/transport.c index 4268b38d92d2..ff5f4f333086 100644 --- a/net/rxrpc/transport.c +++ b/net/rxrpc/transport.c
@@ -330,10 +330,10 @@ static int rxrpc_incoming_msg(struct rxrpc_transport *trans,
330	msg->state = RXRPC_MSG_RECEIVED;	330	msg->state = RXRPC_MSG_RECEIVED;
331	skb_get_timestamp(pkt, &msg->stamp);	331	skb_get_timestamp(pkt, &msg->stamp);
332	if (msg->stamp.tv_sec == 0) {	332	if (msg->stamp.tv_sec == 0) {
333	do_gettimeofday(&msg->stamp);	333	do_gettimeofday(&msg->stamp);
334	if (pkt->sk)	334	if (pkt->sk)
335	sock_enable_timestamp(pkt->sk);	335	sock_enable_timestamp(pkt->sk);
336	}	336	}
337	msg->seq = ntohl(msg->hdr.seq);	337	msg->seq = ntohl(msg->hdr.seq);
338		338
339	/* attach the packet */	339	/* attach the packet */