diff options
Diffstat (limited to 'net/unix/af_unix.c')
-rw-r--r-- | net/unix/af_unix.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index c77ced0109b7..7b52a380d710 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
@@ -212,7 +212,7 @@ EXPORT_SYMBOL_GPL(unix_peer_get); | |||
212 | 212 | ||
213 | static inline void unix_release_addr(struct unix_address *addr) | 213 | static inline void unix_release_addr(struct unix_address *addr) |
214 | { | 214 | { |
215 | if (atomic_dec_and_test(&addr->refcnt)) | 215 | if (refcount_dec_and_test(&addr->refcnt)) |
216 | kfree(addr); | 216 | kfree(addr); |
217 | } | 217 | } |
218 | 218 | ||
@@ -442,7 +442,7 @@ static int unix_dgram_peer_wake_me(struct sock *sk, struct sock *other) | |||
442 | static int unix_writable(const struct sock *sk) | 442 | static int unix_writable(const struct sock *sk) |
443 | { | 443 | { |
444 | return sk->sk_state != TCP_LISTEN && | 444 | return sk->sk_state != TCP_LISTEN && |
445 | (atomic_read(&sk->sk_wmem_alloc) << 2) <= sk->sk_sndbuf; | 445 | (refcount_read(&sk->sk_wmem_alloc) << 2) <= sk->sk_sndbuf; |
446 | } | 446 | } |
447 | 447 | ||
448 | static void unix_write_space(struct sock *sk) | 448 | static void unix_write_space(struct sock *sk) |
@@ -487,7 +487,7 @@ static void unix_sock_destructor(struct sock *sk) | |||
487 | 487 | ||
488 | skb_queue_purge(&sk->sk_receive_queue); | 488 | skb_queue_purge(&sk->sk_receive_queue); |
489 | 489 | ||
490 | WARN_ON(atomic_read(&sk->sk_wmem_alloc)); | 490 | WARN_ON(refcount_read(&sk->sk_wmem_alloc)); |
491 | WARN_ON(!sk_unhashed(sk)); | 491 | WARN_ON(!sk_unhashed(sk)); |
492 | WARN_ON(sk->sk_socket); | 492 | WARN_ON(sk->sk_socket); |
493 | if (!sock_flag(sk, SOCK_DEAD)) { | 493 | if (!sock_flag(sk, SOCK_DEAD)) { |
@@ -864,7 +864,7 @@ static int unix_autobind(struct socket *sock) | |||
864 | goto out; | 864 | goto out; |
865 | 865 | ||
866 | addr->name->sun_family = AF_UNIX; | 866 | addr->name->sun_family = AF_UNIX; |
867 | atomic_set(&addr->refcnt, 1); | 867 | refcount_set(&addr->refcnt, 1); |
868 | 868 | ||
869 | retry: | 869 | retry: |
870 | addr->len = sprintf(addr->name->sun_path+1, "%05x", ordernum) + 1 + sizeof(short); | 870 | addr->len = sprintf(addr->name->sun_path+1, "%05x", ordernum) + 1 + sizeof(short); |
@@ -1040,7 +1040,7 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) | |||
1040 | memcpy(addr->name, sunaddr, addr_len); | 1040 | memcpy(addr->name, sunaddr, addr_len); |
1041 | addr->len = addr_len; | 1041 | addr->len = addr_len; |
1042 | addr->hash = hash ^ sk->sk_type; | 1042 | addr->hash = hash ^ sk->sk_type; |
1043 | atomic_set(&addr->refcnt, 1); | 1043 | refcount_set(&addr->refcnt, 1); |
1044 | 1044 | ||
1045 | if (sun_path[0]) { | 1045 | if (sun_path[0]) { |
1046 | addr->hash = UNIX_HASH_SIZE; | 1046 | addr->hash = UNIX_HASH_SIZE; |
@@ -1335,7 +1335,7 @@ restart: | |||
1335 | 1335 | ||
1336 | /* copy address information from listening to new sock*/ | 1336 | /* copy address information from listening to new sock*/ |
1337 | if (otheru->addr) { | 1337 | if (otheru->addr) { |
1338 | atomic_inc(&otheru->addr->refcnt); | 1338 | refcount_inc(&otheru->addr->refcnt); |
1339 | newu->addr = otheru->addr; | 1339 | newu->addr = otheru->addr; |
1340 | } | 1340 | } |
1341 | if (otheru->path.dentry) { | 1341 | if (otheru->path.dentry) { |
@@ -2033,7 +2033,7 @@ alloc_skb: | |||
2033 | skb->len += size; | 2033 | skb->len += size; |
2034 | skb->data_len += size; | 2034 | skb->data_len += size; |
2035 | skb->truesize += size; | 2035 | skb->truesize += size; |
2036 | atomic_add(size, &sk->sk_wmem_alloc); | 2036 | refcount_add(size, &sk->sk_wmem_alloc); |
2037 | 2037 | ||
2038 | if (newskb) { | 2038 | if (newskb) { |
2039 | err = unix_scm_to_skb(&scm, skb, false); | 2039 | err = unix_scm_to_skb(&scm, skb, false); |
@@ -2847,7 +2847,7 @@ static int unix_seq_show(struct seq_file *seq, void *v) | |||
2847 | 2847 | ||
2848 | seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5lu", | 2848 | seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5lu", |
2849 | s, | 2849 | s, |
2850 | atomic_read(&s->sk_refcnt), | 2850 | refcount_read(&s->sk_refcnt), |
2851 | 0, | 2851 | 0, |
2852 | s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0, | 2852 | s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0, |
2853 | s->sk_type, | 2853 | s->sk_type, |