summaryrefslogtreecommitdiffstats
path: root/net/unix/garbage.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-12-01 16:39:08 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-12-01 16:39:08 +0900
commitfa3c9f3de2504bb09f8ad512f89837751a3eb741 (patch)
tree656df0e4ea62d1c5a45bb7bfd1b4714f4936d63b /net/unix/garbage.c
parent193006f7e3b1abd42d7a3677b54fa2996461a842 (diff)
parent55661fc1f105ed75852e937bf8ea408270eb0cca (diff)
downloadop-kernel-dev-fa3c9f3de2504bb09f8ad512f89837751a3eb741.zip
op-kernel-dev-fa3c9f3de2504bb09f8ad512f89837751a3eb741.tar.gz
Merge branch 'sh/cachetlb' into sh-fixes-for-linus
Diffstat (limited to 'net/unix/garbage.c')
-rw-r--r--net/unix/garbage.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/net/unix/garbage.c b/net/unix/garbage.c
index c8df6fd..f89f83b 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);
}
OpenPOWER on IntegriCloud