diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-09-11 14:08:41 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-09-11 14:08:41 -0400 |
| commit | 623b3e1d645e42030897d18d37db10133d763006 (patch) | |
| tree | 090ff481cd72b47ff87d50615461712a33ba41e6 /net/socket.c | |
| parent | c576af479162c0a11d4e2691ebc97354958d9285 (diff) | |
| parent | 38f5745c5a90641079fd5b48600ae63f7ab6edcd (diff) | |
Merge branch 'from-linus' into upstream
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; |