Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13111698 authored by Adrian Bunk's avatar Adrian Bunk Committed by David S. Miller
Browse files

[AF_UNIX]: Make code static. 



The following code can now become static:
- struct unix_socket_table
- unix_table_lock

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1a3a206f

include/net/af_unix.h

+0 −29
Original line number Original line Diff line number Diff line
@@ -12,37 +12,8 @@ extern void unix_gc(void); 




#define UNIX_HASH_SIZE	256

#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;

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 {

struct unix_address {

	atomic_t	refcnt;

	atomic_t	refcnt;

	int		len;

	int		len;

net/unix/af_unix.c

+28 −2
Original line number Original line Diff line number Diff line
@@ -118,14 +118,40 @@ 




int sysctl_unix_max_dgram_qlen __read_mostly = 10;

int sysctl_unix_max_dgram_qlen __read_mostly = 10;





struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];

static struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];

DEFINE_SPINLOCK(unix_table_lock);

static DEFINE_SPINLOCK(unix_table_lock);

static atomic_t unix_nr_socks = ATOMIC_INIT(0);

static atomic_t unix_nr_socks = ATOMIC_INIT(0);





#define unix_sockets_unbound	(&unix_socket_table[UNIX_HASH_SIZE])

#define unix_sockets_unbound	(&unix_socket_table[UNIX_HASH_SIZE])





#define UNIX_ABSTRACT(sk)	(unix_sk(sk)->addr->hash != 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

#ifdef CONFIG_SECURITY_NETWORK

static void unix_get_secdata(struct scm_cookie *scm, struct sk_buff *skb)

static void unix_get_secdata(struct scm_cookie *scm, struct sk_buff *skb)

{

{