From owner-svn-src-user@FreeBSD.ORG  Sun May  4 18:15:07 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C5E4652C;
 Sun,  4 May 2014 18:15:07 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B3A4111E5;
 Sun,  4 May 2014 18:15:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s44IF7ne011956;
 Sun, 4 May 2014 18:15:07 GMT (envelope-from dchagin@svn.freebsd.org)
Received: (from dchagin@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s44IF7dw011954;
 Sun, 4 May 2014 18:15:07 GMT (envelope-from dchagin@svn.freebsd.org)
Message-Id: <201405041815.s44IF7dw011954@svn.freebsd.org>
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Sun, 4 May 2014 18:15:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r265335 - user/dchagin/lemul/sys/compat/linux
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 May 2014 18:15:07 -0000

Author: dchagin
Date: Sun May  4 18:15:07 2014
New Revision: 265335
URL: http://svnweb.freebsd.org/changeset/base/265335

Log:
  Destroy the epoll private data in a case of execing from
  Linux binary to Linux binary.

Modified:
  user/dchagin/lemul/sys/compat/linux/linux_emul.c

Modified: user/dchagin/lemul/sys/compat/linux/linux_emul.c
==============================================================================
--- user/dchagin/lemul/sys/compat/linux/linux_emul.c	Sun May  4 17:53:01 2014	(r265334)
+++ user/dchagin/lemul/sys/compat/linux/linux_emul.c	Sun May  4 18:15:07 2014	(r265335)
@@ -177,6 +177,11 @@ linux_proc_init(struct thread *td, struc
 		KASSERT(em != NULL, ("proc_init: emuldata not found in exec case.\n"));
 
 		em->em_tid = td->td_proc->p_pid;
+
+		 /* epoll should be destroyed in a case of exec. */
+		pem = pem_find(td->td_proc);
+		KASSERT(pem != NULL, ("proc_exit: proc emuldata not found.\n"));
+		epoll_destroy_emuldata(pem);
 	}
 
 	em->child_clear_tid = NULL;