Skip to contentSkip to conversation

kill net/rxrpc/rxrpc_syms.c

PATCH In review Adrian Bunk 4 participants 6 messages Nov 26, 2006 – Nov 28, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kill net/rxrpc/rxrpc_syms.c

This patch moves the EXPORT_SYMBOL's from net/rxrpc/rxrpc_syms.c to the files with the actual functions.

---

 net/rxrpc/Makefile     |    1 -
 net/rxrpc/call.c       |    5 +++++
 net/rxrpc/connection.c |    2 ++
 net/rxrpc/rxrpc_syms.c |   34 ----------------------------------
 net/rxrpc/transport.c  |    4 ++++
 5 files changed, 11 insertions(+), 35 deletions(-)
net/rxrpc/Makefile renamed from net/rxrpc/Makefile.old +0 -1
@@ -12,7 +12,6 @@
 	krxtimod.o \
 	main.o \
 	peer.o \
-	rxrpc_syms.o \
 	transport.o
 
 ifeq ($(CONFIG_PROC_FS),y)
net/rxrpc/call.c renamed from net/rxrpc/call.c.old +5 -0
@@ -314,6 +314,7 @@
 	_leave(" = %d", ret);
 	return ret;
 } /* end rxrpc_create_call() */
+EXPORT_SYMBOL(rxrpc_create_call);
 
 /*****************************************************************************/
 /*
@@ -465,6 +466,7 @@
 
 	_leave(" [destroyed]");
 } /* end rxrpc_put_call() */
+EXPORT_SYMBOL(rxrpc_put_call);
 
 /*****************************************************************************/
 /*
@@ -923,6 +925,7 @@
 	return __rxrpc_call_abort(call, error);
 
 } /* end rxrpc_call_abort() */
+EXPORT_SYMBOL(rxrpc_call_abort);
 
 /*****************************************************************************/
 /*
@@ -1910,6 +1913,7 @@
 	}
 
 } /* end rxrpc_call_read_data() */
+EXPORT_SYMBOL(rxrpc_call_read_data);
 
 /*****************************************************************************/
 /*
@@ -2076,6 +2080,7 @@
 	return ret;
 
 } /* end rxrpc_call_write_data() */
+EXPORT_SYMBOL(rxrpc_call_write_data);
 
 /*****************************************************************************/
 /*
net/rxrpc/connection.c renamed from net/rxrpc/connection.c.old +2 -0
@@ -207,6 +207,7 @@
 	spin_unlock(&peer->conn_gylock);
 	goto make_active;
 } /* end rxrpc_create_connection() */
+EXPORT_SYMBOL(rxrpc_create_connection);
 
 /*****************************************************************************/
 /*
@@ -411,6 +412,7 @@
 
 	_leave(" [killed]");
 } /* end rxrpc_put_connection() */
+EXPORT_SYMBOL(rxrpc_put_connection);
 
 /*****************************************************************************/
 /*
net/rxrpc/transport.c renamed from net/rxrpc/transport.c.old +4 -0
@@ -146,6 +146,7 @@
 	_leave(" = %d", ret);
 	return ret;
 } /* end rxrpc_create_transport() */
+EXPORT_SYMBOL(rxrpc_create_transport);
 
 /*****************************************************************************/
 /*
@@ -196,6 +197,7 @@
 
 	_leave("");
 } /* end rxrpc_put_transport() */
+EXPORT_SYMBOL(rxrpc_put_transport);
 
 /*****************************************************************************/
 /*
@@ -231,6 +233,7 @@
 	_leave("= %d", ret);
 	return ret;
 } /* end rxrpc_add_service() */
+EXPORT_SYMBOL(rxrpc_add_service);
 
 /*****************************************************************************/
 /*
@@ -248,6 +251,7 @@
 
 	_leave("");
 } /* end rxrpc_del_service() */
+EXPORT_SYMBOL(rxrpc_del_service);
 
 /*****************************************************************************/
 /*
net/rxrpc/rxrpc_syms.c deleted +0 -34
@@ -1,34 +0,0 @@
-/* rxrpc_syms.c: exported Rx RPC layer interface symbols
- *
- * Copyright (C) 2002 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells ([email protected])
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#include <linux/module.h>
-
-#include <rxrpc/transport.h>
-#include <rxrpc/connection.h>
-#include <rxrpc/call.h>
-#include <rxrpc/krxiod.h>
-
-/* call.c */
-EXPORT_SYMBOL(rxrpc_create_call);
-EXPORT_SYMBOL(rxrpc_put_call);
-EXPORT_SYMBOL(rxrpc_call_abort);
-EXPORT_SYMBOL(rxrpc_call_read_data);
-EXPORT_SYMBOL(rxrpc_call_write_data);
-
-/* connection.c */
-EXPORT_SYMBOL(rxrpc_create_connection);
-EXPORT_SYMBOL(rxrpc_put_connection);
-
-/* transport.c */
-EXPORT_SYMBOL(rxrpc_create_transport);
-EXPORT_SYMBOL(rxrpc_put_transport);
-EXPORT_SYMBOL(rxrpc_add_service);
-EXPORT_SYMBOL(rxrpc_del_service);
maintainer
#1 lore raw
Quoted 2 lines · Adrian Bunk

This patch moves the EXPORT_SYMBOL's from net/rxrpc/rxrpc_syms.c to the files with the actual functions.

You can if you like. Can you slap a blank line before each EXPORT_SYMBOL() though please?

David

#2 lore raw

PATCH 1/1 kill net/rxrpc/rxrpc_syms.c

Quoted 7 lines · David Howells
Quoted 2 lines · Adrian Bunk

This patch moves the EXPORT_SYMBOL's from net/rxrpc/rxrpc_syms.c to the files with the actual functions.

You can if you like. Can you slap a blank line before each EXPORT_SYMBOL() though please?

Updated patch below.

Quoted 1 line

David

cu
Adrian

<-- snip -->

This patch moves the EXPORT_SYMBOL's from net/rxrpc/rxrpc_syms.c to the files with the actual functions.

---

 net/rxrpc/Makefile     |    1 -
 net/rxrpc/call.c       |   10 ++++++++++
 net/rxrpc/connection.c |    4 ++++
 net/rxrpc/rxrpc_syms.c |   34 ----------------------------------
 net/rxrpc/transport.c  |    8 ++++++++
 5 files changed, 22 insertions(+), 35 deletions(-)
net/rxrpc/Makefile renamed from net/rxrpc/Makefile.old +0 -1
@@ -12,7 +12,6 @@
 	krxtimod.o \
 	main.o \
 	peer.o \
-	rxrpc_syms.o \
 	transport.o
 
 ifeq ($(CONFIG_PROC_FS),y)
net/rxrpc/call.c renamed from net/rxrpc/call.c.old +10 -0
@@ -315,6 +315,8 @@
 	return ret;
 } /* end rxrpc_create_call() */
 
+EXPORT_SYMBOL(rxrpc_create_call);
+
 /*****************************************************************************/
 /*
  * create a new call record for incoming calls
@@ -466,6 +468,8 @@
 	_leave(" [destroyed]");
 } /* end rxrpc_put_call() */
 
+EXPORT_SYMBOL(rxrpc_put_call);
+
 /*****************************************************************************/
 /*
  * actually generate a normal ACK
@@ -924,6 +928,8 @@
 
 } /* end rxrpc_call_abort() */
 
+EXPORT_SYMBOL(rxrpc_call_abort);
+
 /*****************************************************************************/
 /*
  * process packets waiting for this call
@@ -1911,6 +1917,8 @@
 
 } /* end rxrpc_call_read_data() */
 
+EXPORT_SYMBOL(rxrpc_call_read_data);
+
 /*****************************************************************************/
 /*
  * write data to a call
@@ -2077,6 +2085,8 @@
 
 } /* end rxrpc_call_write_data() */
 
+EXPORT_SYMBOL(rxrpc_call_write_data);
+
 /*****************************************************************************/
 /*
  * flush outstanding packets to the network
net/rxrpc/connection.c renamed from net/rxrpc/connection.c.old +4 -0
@@ -208,6 +208,8 @@
 	goto make_active;
 } /* end rxrpc_create_connection() */
 
+EXPORT_SYMBOL(rxrpc_create_connection);
+
 /*****************************************************************************/
 /*
  * lookup the connection for an incoming packet
@@ -412,6 +414,8 @@
 	_leave(" [killed]");
 } /* end rxrpc_put_connection() */
 
+EXPORT_SYMBOL(rxrpc_put_connection);
+
 /*****************************************************************************/
 /*
  * free a connection record
net/rxrpc/transport.c renamed from net/rxrpc/transport.c.old +8 -0
@@ -147,6 +147,8 @@
 	return ret;
 } /* end rxrpc_create_transport() */
 
+EXPORT_SYMBOL(rxrpc_create_transport);
+
 /*****************************************************************************/
 /*
  * destroy a transport endpoint
@@ -197,6 +199,8 @@
 	_leave("");
 } /* end rxrpc_put_transport() */
 
+EXPORT_SYMBOL(rxrpc_put_transport);
+
 /*****************************************************************************/
 /*
  * add a service to a transport to be listened upon
@@ -232,6 +236,8 @@
 	return ret;
 } /* end rxrpc_add_service() */
 
+EXPORT_SYMBOL(rxrpc_add_service);
+
 /*****************************************************************************/
 /*
  * remove a service from a transport
@@ -249,6 +255,8 @@
 	_leave("");
 } /* end rxrpc_del_service() */
 
+EXPORT_SYMBOL(rxrpc_del_service);
+
 /*****************************************************************************/
 /*
  * INET callback when data has been received on the socket.
net/rxrpc/rxrpc_syms.c deleted +0 -34
@@ -1,34 +0,0 @@
-/* rxrpc_syms.c: exported Rx RPC layer interface symbols
- *
- * Copyright (C) 2002 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells ([email protected])
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#include <linux/module.h>
-
-#include <rxrpc/transport.h>
-#include <rxrpc/connection.h>
-#include <rxrpc/call.h>
-#include <rxrpc/krxiod.h>
-
-/* call.c */
-EXPORT_SYMBOL(rxrpc_create_call);
-EXPORT_SYMBOL(rxrpc_put_call);
-EXPORT_SYMBOL(rxrpc_call_abort);
-EXPORT_SYMBOL(rxrpc_call_read_data);
-EXPORT_SYMBOL(rxrpc_call_write_data);
-
-/* connection.c */
-EXPORT_SYMBOL(rxrpc_create_connection);
-EXPORT_SYMBOL(rxrpc_put_connection);
-
-/* transport.c */
-EXPORT_SYMBOL(rxrpc_create_transport);
-EXPORT_SYMBOL(rxrpc_put_transport);
-EXPORT_SYMBOL(rxrpc_add_service);
-EXPORT_SYMBOL(rxrpc_del_service);
#4 lore raw
In reply to David Howells
Quoted 7 lines · On Mon, 27 Nov 2006 11:21:25 +0000 David Howells <[email protected]> wrote:
Quoted 2 lines · Adrian Bunk

This patch moves the EXPORT_SYMBOL's from net/rxrpc/rxrpc_syms.c to the files with the actual functions.

You can if you like. Can you slap a blank line before each EXPORT_SYMBOL() though please?

We have a mixture of both styles and given that they waste space in return for no added value, people have been gradually removing these blank lines in many places. Please don't add more.

#5 lore raw
Quoted 8 lines · Andrew Morton
Quoted 5 lines · On Mon, 27 Nov 2006 11:21:25 +0000 David Howells <[email protected]> wrote:
Quoted 2 lines · Adrian Bunk

This patch moves the EXPORT_SYMBOL's from net/rxrpc/rxrpc_syms.c to the files with the actual functions.

Quoted 6 lines
Quoted 2 lines

You can if you like. Can you slap a blank line before each EXPORT_SYMBOL() though please?

We have a mixture of both styles and given that they waste space in return for no added value, people have been gradually removing these blank lines in many places. Please don't add more.

Agreed, good thing would be if we could have something like

void foo(int bar) gpl_exported
{
}

I.e. some kind of __attribute__, nah, I should just get some sleep :-)

- Arnaldo

maintainer Acked-by on v1 1/1
#3 lore raw
In reply to Adrian Bunk
Quoted 7 lines · Adrian Bunk
Quoted 5 lines
Quoted 2 lines

This patch moves the EXPORT_SYMBOL's from net/rxrpc/rxrpc_syms.c to the files with the actual functions.

You can if you like. Can you slap a blank line before each EXPORT_SYMBOL() though please?

Updated patch below.