diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
| commit | f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d (patch) | |
| tree | b027b5f3429d416b3da5b9195024007dab062a5e /net/unix/af_unix.c | |
| parent | e935d5da8e5d12fabe5b632736c50eae0427e8c8 (diff) | |
| parent | 67963132638e67ad3c5aa16765e6f3f2f3cdd85c (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 1b5989b1b670..c323cc6a28b0 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
| @@ -547,7 +547,7 @@ static struct sock * unix_create1(struct socket *sock) | |||
| 547 | struct sock *sk = NULL; | 547 | struct sock *sk = NULL; |
| 548 | struct unix_sock *u; | 548 | struct unix_sock *u; |
| 549 | 549 | ||
| 550 | if (atomic_read(&unix_nr_socks) >= 2*files_stat.max_files) | 550 | if (atomic_read(&unix_nr_socks) >= 2*get_max_files()) |
| 551 | goto out; | 551 | goto out; |
| 552 | 552 | ||
| 553 | sk = sk_alloc(PF_UNIX, GFP_KERNEL, &unix_proto, 1); | 553 | sk = sk_alloc(PF_UNIX, GFP_KERNEL, &unix_proto, 1); |