The following code can now become static:
- struct unix_socket_table
- unix_table_lock
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
include/net/af_unix.h | 29 -
net/unix/af_unix.c| 30 --
2 files changed, 28 insertions(+), 31 deletions(-)
--- linux-2.6.23-rc1-mm1/include/net/af_unix.h.old 2007-07-26
21:17:33.0 +0200
+++ linux-2.6.23-rc1-mm1/include/net/af_unix.h 2007-07-26 21:20:27.0
+0200
@@ -12,37 +12,8 @@
#define UNIX_HASH_SIZE 256
-extern struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];
-extern spinlock_t unix_table_lock;
-
extern atomic_t unix_tot_inflight;
-static inline struct sock *first_unix_socket(int *i)
-{
- for (*i = 0; *i = UNIX_HASH_SIZE; (*i)++) {
- if (!hlist_empty(unix_socket_table[*i]))
- return __sk_head(unix_socket_table[*i]);
- }
- return NULL;
-}
-
-static inline struct sock *next_unix_socket(int *i, struct sock *s)
-{
- struct sock *next = sk_next(s);
- /* More in this chain? */
- if (next)
- return next;
- /* Look for next non-empty chain. */
- for ((*i)++; *i = UNIX_HASH_SIZE; (*i)++) {
- if (!hlist_empty(unix_socket_table[*i]))
- return __sk_head(unix_socket_table[*i]);
- }
- return NULL;
-}
-
-#define forall_unix_sockets(i, s) \
- for (s = first_unix_socket((i)); s; s = next_unix_socket((i),(s)))
-
struct unix_address {
atomic_trefcnt;
int len;
--- linux-2.6.23-rc1-mm1/net/unix/af_unix.c.old 2007-07-26 21:17:48.0
+0200
+++ linux-2.6.23-rc1-mm1/net/unix/af_unix.c 2007-07-26 21:20:24.0
+0200
@@ -118,14 +118,40 @@
int sysctl_unix_max_dgram_qlen __read_mostly = 10;
-struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];
-DEFINE_SPINLOCK(unix_table_lock);
+static struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];
+static DEFINE_SPINLOCK(unix_table_lock);
static atomic_t unix_nr_socks = ATOMIC_INIT(0);
#define unix_sockets_unbound (unix_socket_table[UNIX_HASH_SIZE])
#define UNIX_ABSTRACT(sk) (unix_sk(sk)-addr-hash != UNIX_HASH_SIZE)
+static struct sock *first_unix_socket(int *i)
+{
+ for (*i = 0; *i = UNIX_HASH_SIZE; (*i)++) {
+ if (!hlist_empty(unix_socket_table[*i]))
+ return __sk_head(unix_socket_table[*i]);
+ }
+ return NULL;
+}
+
+static struct sock *next_unix_socket(int *i, struct sock *s)
+{
+ struct sock *next = sk_next(s);
+ /* More in this chain? */
+ if (next)
+ return next;
+ /* Look for next non-empty chain. */
+ for ((*i)++; *i = UNIX_HASH_SIZE; (*i)++) {
+ if (!hlist_empty(unix_socket_table[*i]))
+ return __sk_head(unix_socket_table[*i]);
+ }
+ return NULL;
+}
+
+#define forall_unix_sockets(i, s) \
+ for (s = first_unix_socket((i)); s; s = next_unix_socket((i),(s)))
+
#ifdef CONFIG_SECURITY_NETWORK
static void unix_get_secdata(struct scm_cookie *scm, struct sk_buff *skb)
{
-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html