diff options
| author | Michal Simek <monstr@monstr.eu> | 2011-01-10 09:29:29 +0100 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2011-01-10 09:29:29 +0100 |
| commit | 20c040ce2176be4be250503497a0a103a3fb3b3e (patch) | |
| tree | fce5d1cf5860ea2aeb292736fd373da8e2ea5a98 /net/unix/garbage.c | |
| parent | 7f01af04bdf59448f3d75744d7ad9713331bd0f7 (diff) | |
| parent | 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 (diff) | |
Merge commit 'v2.6.37' into next
Diffstat (limited to 'net/unix/garbage.c')
| -rw-r--r-- | net/unix/garbage.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/unix/garbage.c b/net/unix/garbage.c index c8df6fda0b1..f89f83bf828 100644 --- a/net/unix/garbage.c +++ b/net/unix/garbage.c @@ -96,7 +96,7 @@ static DECLARE_WAIT_QUEUE_HEAD(unix_gc_wait); unsigned int unix_tot_inflight; -static struct sock *unix_get_socket(struct file *filp) +struct sock *unix_get_socket(struct file *filp) { struct sock *u_sock = NULL; struct inode *inode = filp->f_path.dentry->d_inode; @@ -259,9 +259,16 @@ static void inc_inflight_move_tail(struct unix_sock *u) } static bool gc_in_progress = false; +#define UNIX_INFLIGHT_TRIGGER_GC 16000 void wait_for_unix_gc(void) { + /* + * If number of inflight sockets is insane, + * force a garbage collect right now. + */ + if (unix_tot_inflight > UNIX_INFLIGHT_TRIGGER_GC && !gc_in_progress) + unix_gc(); wait_event(unix_gc_wait, gc_in_progress == false); } |