diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-09-13 17:07:18 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-09-13 17:07:18 -0400 |
| commit | c547fc28ab3e8716076fdaf4bd0260c5d63a18f7 (patch) | |
| tree | 34af1fa64a63618660187ae58ad182665a1861ef /net/socket.c | |
| parent | 3dd836a56de0d4f049438412959b905e1db4666e (diff) | |
| parent | 63b98080daa35f0d682db04f4fb7ada010888752 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index b4848ce0d6ac..6d261bf206fc 100644 --- a/net/socket.c +++ b/net/socket.c | |||
| @@ -1178,7 +1178,8 @@ static int __sock_create(int family, int type, int protocol, struct socket **res | |||
| 1178 | */ | 1178 | */ |
| 1179 | 1179 | ||
| 1180 | if (!(sock = sock_alloc())) { | 1180 | if (!(sock = sock_alloc())) { |
| 1181 | printk(KERN_WARNING "socket: no more sockets\n"); | 1181 | if (net_ratelimit()) |
| 1182 | printk(KERN_WARNING "socket: no more sockets\n"); | ||
| 1182 | err = -ENFILE; /* Not exactly a match, but its the | 1183 | err = -ENFILE; /* Not exactly a match, but its the |
| 1183 | closest posix thing */ | 1184 | closest posix thing */ |
| 1184 | goto out; | 1185 | goto out; |