[2.6 patch] kill net/rxrpc/rxrpc_syms.c

[2.6 patch] kill net/rxrpc/rxrpc_syms.c

[Adrian Bunk]

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

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

This patch was already sent on:
- 26 Nov 2006

 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(-)

--- linux-2.6.19-rc6-mm1/net/rxrpc/Makefile.old	2006-11-26 04:49:25.000000000 +0100
+++ linux-2.6.19-rc6-mm1/net/rxrpc/Makefile	2006-11-26 04:50:08.000000000 +0100
@@ -12,7 +12,6 @@
 	krxtimod.o \
 	main.o \
 	peer.o \
-	rxrpc_syms.o \
 	transport.o
 
 ifeq ($(CONFIG_PROC_FS),y)
--- linux-2.6.19-rc6-mm1/net/rxrpc/call.c.old	2006-11-26 04:50:51.000000000 +0100
+++ linux-2.6.19-rc6-mm1/net/rxrpc/call.c	2006-11-26 04:51:58.000000000 +0100
@@ -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);
 
 /*****************************************************************************/
 /*
--- linux-2.6.19-rc6-mm1/net/rxrpc/connection.c.old	2006-11-26 04:52:08.000000000 +0100
+++ linux-2.6.19-rc6-mm1/net/rxrpc/connection.c	2006-11-26 04:52:32.000000000 +0100
@@ -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);
 
 /*****************************************************************************/
 /*
--- linux-2.6.19-rc6-mm1/net/rxrpc/transport.c.old	2006-11-26 04:52:43.000000000 +0100
+++ linux-2.6.19-rc6-mm1/net/rxrpc/transport.c	2006-11-26 04:53:36.000000000 +0100
@@ -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);
 
 /*****************************************************************************/
 /*
--- linux-2.6.19-rc6-mm1/net/rxrpc/rxrpc_syms.c	2006-09-20 05:42:06.000000000 +0200
+++ /dev/null	2006-09-19 00:45:31.000000000 +0200
@@ -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 (dhowells@redhat.com)
- *
- * 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);

Re: [2.6 patch] kill net/rxrpc/rxrpc_syms.c

[David Howells]

Adrian Bunk <bunk@stusta.de> wrote:

>  } /* end rxrpc_create_call() */
> +EXPORT_SYMBOL(rxrpc_create_call);

A blank line between the end of the function and the EXPORT_SYMBOL please.

David

Re: [2.6 patch] kill net/rxrpc/rxrpc_syms.c

[Adrian Bunk]

On Tue, Feb 20, 2007 at 10:59:46AM +0000, David Howells wrote:
> Adrian Bunk <bunk@stusta.de> wrote:
> 
> >  } /* end rxrpc_create_call() */
> > +EXPORT_SYMBOL(rxrpc_create_call);
> 
> A blank line between the end of the function and the EXPORT_SYMBOL please.

Please discuss this with Andrew [1] and tell me what you agreed upon.

> David

cu
Adrian

[1] http://lkml.org/lkml/2006/11/27/293

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: [2.6 patch] kill net/rxrpc/rxrpc_syms.c

[David Howells]

Adrian Bunk <bunk@stusta.de> wrote:

> > > 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.

Acked-By: David Howells <dhowells@redhat.com>

Re: [2.6 patch] kill net/rxrpc/rxrpc_syms.c

[Arnaldo Carvalho de Melo]

On 11/28/06, Andrew Morton <akpm@osdl.org> wrote:
> On Mon, 27 Nov 2006 11:21:25 +0000
> David Howells <dhowells@redhat.com> wrote:
>
> > Adrian Bunk <bunk@stusta.de> wrote:
> >
> > > 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.

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

Re: [2.6 patch] kill net/rxrpc/rxrpc_syms.c

[Andrew Morton]

On Mon, 27 Nov 2006 11:21:25 +0000
David Howells <dhowells@redhat.com> wrote:

> Adrian Bunk <bunk@stusta.de> wrote:
> 
> > 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.

[2.6 patch] kill net/rxrpc/rxrpc_syms.c

[Adrian Bunk]

On Mon, Nov 27, 2006 at 11:21:25AM +0000, David Howells wrote:
> Adrian Bunk <bunk@stusta.de> wrote:
> 
> > 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.

> David

cu
Adrian


<--  snip  -->


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

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 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(-)

--- linux-2.6.19-rc6-mm1/net/rxrpc/Makefile.old	2006-11-26 04:49:25.000000000 +0100
+++ linux-2.6.19-rc6-mm1/net/rxrpc/Makefile	2006-11-26 04:50:08.000000000 +0100
@@ -12,7 +12,6 @@
 	krxtimod.o \
 	main.o \
 	peer.o \
-	rxrpc_syms.o \
 	transport.o
 
 ifeq ($(CONFIG_PROC_FS),y)
--- linux-2.6.19-rc6-mm1/net/rxrpc/call.c.old	2006-11-26 04:50:51.000000000 +0100
+++ linux-2.6.19-rc6-mm1/net/rxrpc/call.c	2006-11-27 22:15:05.000000000 +0100
@@ -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
--- linux-2.6.19-rc6-mm1/net/rxrpc/connection.c.old	2006-11-26 04:52:08.000000000 +0100
+++ linux-2.6.19-rc6-mm1/net/rxrpc/connection.c	2006-11-27 22:15:35.000000000 +0100
@@ -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
--- linux-2.6.19-rc6-mm1/net/rxrpc/transport.c.old	2006-11-26 04:52:43.000000000 +0100
+++ linux-2.6.19-rc6-mm1/net/rxrpc/transport.c	2006-11-27 22:15:57.000000000 +0100
@@ -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.
--- linux-2.6.19-rc6-mm1/net/rxrpc/rxrpc_syms.c	2006-09-20 05:42:06.000000000 +0200
+++ /dev/null	2006-09-19 00:45:31.000000000 +0200
@@ -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 (dhowells@redhat.com)
- *
- * 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);

Re: [2.6 patch] kill net/rxrpc/rxrpc_syms.c

[David Howells]

Adrian Bunk <bunk@stusta.de> wrote:

> 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.6 patch] kill net/rxrpc/rxrpc_syms.c

[Adrian Bunk]

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

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 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(-)

--- linux-2.6.19-rc6-mm1/net/rxrpc/Makefile.old	2006-11-26 04:49:25.000000000 +0100
+++ linux-2.6.19-rc6-mm1/net/rxrpc/Makefile	2006-11-26 04:50:08.000000000 +0100
@@ -12,7 +12,6 @@
 	krxtimod.o \
 	main.o \
 	peer.o \
-	rxrpc_syms.o \
 	transport.o
 
 ifeq ($(CONFIG_PROC_FS),y)
--- linux-2.6.19-rc6-mm1/net/rxrpc/call.c.old	2006-11-26 04:50:51.000000000 +0100
+++ linux-2.6.19-rc6-mm1/net/rxrpc/call.c	2006-11-26 04:51:58.000000000 +0100
@@ -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);
 
 /*****************************************************************************/
 /*
--- linux-2.6.19-rc6-mm1/net/rxrpc/connection.c.old	2006-11-26 04:52:08.000000000 +0100
+++ linux-2.6.19-rc6-mm1/net/rxrpc/connection.c	2006-11-26 04:52:32.000000000 +0100
@@ -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);
 
 /*****************************************************************************/
 /*
--- linux-2.6.19-rc6-mm1/net/rxrpc/transport.c.old	2006-11-26 04:52:43.000000000 +0100
+++ linux-2.6.19-rc6-mm1/net/rxrpc/transport.c	2006-11-26 04:53:36.000000000 +0100
@@ -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);
 
 /*****************************************************************************/
 /*
--- linux-2.6.19-rc6-mm1/net/rxrpc/rxrpc_syms.c	2006-09-20 05:42:06.000000000 +0200
+++ /dev/null	2006-09-19 00:45:31.000000000 +0200
@@ -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 (dhowells@redhat.com)
- *
- * 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);