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

Commit 0906a372 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Paul E. McKenney
Browse files

net/netfilter: __rcu annotations 



Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: default avatarPatrick McHardy <kaber@trash.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent 2be85279

include/net/netfilter/nf_conntrack.h

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ struct nf_conntrack_helper; 
/* nf_conn feature for connections that have a helper */

struct nf_conn_help {

	/* Helper. if any */

	struct nf_conntrack_helper *helper;

	struct nf_conntrack_helper __rcu *helper;



	union nf_conntrack_help help;

net/ipv4/netfilter/nf_nat_core.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static DEFINE_SPINLOCK(nf_nat_lock); 
static struct nf_conntrack_l3proto *l3proto __read_mostly;



#define MAX_IP_NAT_PROTO 256

static const struct nf_nat_protocol *nf_nat_protos[MAX_IP_NAT_PROTO]

static const struct nf_nat_protocol __rcu *nf_nat_protos[MAX_IP_NAT_PROTO]

						__read_mostly;



static inline const struct nf_nat_protocol *

net/netfilter/core.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


static DEFINE_MUTEX(afinfo_mutex);



const struct nf_afinfo *nf_afinfo[NFPROTO_NUMPROTO] __read_mostly;

const struct nf_afinfo __rcu *nf_afinfo[NFPROTO_NUMPROTO] __read_mostly;

EXPORT_SYMBOL(nf_afinfo);



int nf_register_afinfo(const struct nf_afinfo *afinfo)

net/netfilter/nf_conntrack_ecache.c

+2 −2
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ 


static DEFINE_MUTEX(nf_ct_ecache_mutex);



struct nf_ct_event_notifier *nf_conntrack_event_cb __read_mostly;

struct nf_ct_event_notifier __rcu *nf_conntrack_event_cb __read_mostly;

EXPORT_SYMBOL_GPL(nf_conntrack_event_cb);



struct nf_exp_event_notifier *nf_expect_event_cb __read_mostly;

struct nf_exp_event_notifier __rcu *nf_expect_event_cb __read_mostly;

EXPORT_SYMBOL_GPL(nf_expect_event_cb);



/* deliver cached events and clear cache entry - must be called with locally

net/netfilter/nf_conntrack_extend.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/skbuff.h>

#include <net/netfilter/nf_conntrack_extend.h>



static struct nf_ct_ext_type *nf_ct_ext_types[NF_CT_EXT_NUM];

static struct nf_ct_ext_type __rcu *nf_ct_ext_types[NF_CT_EXT_NUM];

static DEFINE_MUTEX(nf_ct_ext_type_mutex);



void __nf_ct_ext_destroy(struct nf_conn *ct)