aboutsummaryrefslogtreecommitdiffstats
path: root/net/unix
diff options
context:
space:
mode:
Diffstat (limited to 'net/unix')
-rw-r--r--net/unix/af_unix.c3
-rw-r--r--net/unix/sysctl_net_unix.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 826e09938bff..c4ce243824bb 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -114,6 +114,7 @@
114#include <linux/mount.h> 114#include <linux/mount.h>
115#include <net/checksum.h> 115#include <net/checksum.h>
116#include <linux/security.h> 116#include <linux/security.h>
117#include <linux/freezer.h>
117 118
118struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE]; 119struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE];
119EXPORT_SYMBOL_GPL(unix_socket_table); 120EXPORT_SYMBOL_GPL(unix_socket_table);
@@ -1879,7 +1880,7 @@ static long unix_stream_data_wait(struct sock *sk, long timeo,
1879 1880
1880 set_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags); 1881 set_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags);
1881 unix_state_unlock(sk); 1882 unix_state_unlock(sk);
1882 timeo = schedule_timeout(timeo); 1883 timeo = freezable_schedule_timeout(timeo);
1883 unix_state_lock(sk); 1884 unix_state_lock(sk);
1884 clear_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags); 1885 clear_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags);
1885 } 1886 }
diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c
index 8800604c93f4..b3d515021b74 100644
--- a/net/unix/sysctl_net_unix.c
+++ b/net/unix/sysctl_net_unix.c
@@ -15,7 +15,7 @@
15 15
16#include <net/af_unix.h> 16#include <net/af_unix.h>
17 17
18static ctl_table unix_table[] = { 18static struct ctl_table unix_table[] = {
19 { 19 {
20 .procname = "max_dgram_qlen", 20 .procname = "max_dgram_qlen",
21 .data = &init_net.unx.sysctl_max_dgram_qlen, 21 .data = &init_net.unx.sysctl_max_dgram_qlen,