diff options
| author |   Davidlohr Bueso <dave@stgolabs.net> | 2018-05-08 09:06:59 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-05-10 15:13:34 -0400 |
| commit | a7950ae8213cf38343fd27ad1fb58f3f04e3130f (patch) | |
| tree | e3863a021b600eba3db0b21e115bea47258b3e0a /include/net/sock.h | |
| parent | net/ipv4: Update ip_tunnel_metadata_cnt static key to modern api (diff) | |
| download | linux-dev-a7950ae8213cf38343fd27ad1fb58f3f04e3130f.tar.xz linux-dev-a7950ae8213cf38343fd27ad1fb58f3f04e3130f.zip | |
net/sock: Update memalloc_socks static key to modern api
No changes in refcount semantics -- key init is false; replace
static_key_slow_inc|dec with static_branch_inc|dec
static_key_false with static_branch_unlikely
Added a '_key' suffix to memalloc_socks, for better self
documentation.
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 3c568b36ee36..4f7c584e9765 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -808,10 +808,10 @@ static inline bool sock_flag(const struct sock *sk, enum sock_flags flag) } #ifdef CONFIG_NET -extern struct static_key memalloc_socks; +DECLARE_STATIC_KEY_FALSE(memalloc_socks_key); static inline int sk_memalloc_socks(void) { - return static_key_false(&memalloc_socks); + return static_branch_unlikely(&memalloc_socks_key); } #else |