From owner-svn-src-user@FreeBSD.ORG Sat Feb 14 10:56:04 2015
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.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id CEDE0292;
Sat, 14 Feb 2015 10:56:04 +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 BB117C5;
Sat, 14 Feb 2015 10:56:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1EAu4pB085427;
Sat, 14 Feb 2015 10:56:04 GMT (envelope-from dchagin@FreeBSD.org)
Received: (from dchagin@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1EAu4Rb085426;
Sat, 14 Feb 2015 10:56:04 GMT (envelope-from dchagin@FreeBSD.org)
Message-Id: <201502141056.t1EAu4Rb085426@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dchagin set sender to
dchagin@FreeBSD.org using -f
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Sat, 14 Feb 2015 10:56:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r278750 - 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.18-1
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
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: Sat, 14 Feb 2015 10:56:04 -0000
Author: dchagin
Date: Sat Feb 14 10:56:03 2015
New Revision: 278750
URL: https://svnweb.freebsd.org/changeset/base/278750
Log:
As fo_fill_kinfo() does not check fo_fill_kinfo to NULL
add a fo_fill_kinfo op to eventfdops.
Reported by: trinity
Modified:
user/dchagin/lemul/sys/compat/linux/linux_event.c
Modified: user/dchagin/lemul/sys/compat/linux/linux_event.c
==============================================================================
--- user/dchagin/lemul/sys/compat/linux/linux_event.c Sat Feb 14 09:00:12 2015 (r278749)
+++ user/dchagin/lemul/sys/compat/linux/linux_event.c Sat Feb 14 10:56:03 2015 (r278750)
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
#include <sys/mutex.h>
#include <sys/capability.h>
#include <sys/types.h>
+#include <sys/user.h>
#include <sys/file.h>
#include <sys/filedesc.h>
#include <sys/errno.h>
@@ -127,6 +128,7 @@ static fo_poll_t eventfd_poll;
static fo_kqfilter_t eventfd_kqfilter;
static fo_stat_t eventfd_stat;
static fo_close_t eventfd_close;
+static fo_fill_kinfo_t eventfd_fill_kinfo;
static struct fileops eventfdops = {
.fo_read = eventfd_read,
@@ -140,6 +142,7 @@ static struct fileops eventfdops = {
.fo_chmod = invfo_chmod,
.fo_chown = invfo_chown,
.fo_sendfile = invfo_sendfile,
+ .fo_fill_kinfo = eventfd_fill_kinfo,
.fo_flags = DFLAG_PASSABLE
};
@@ -832,3 +835,12 @@ eventfd_stat(struct file *fp, struct sta
return (ENXIO);
}
+
+/*ARGSUSED*/
+static int
+eventfd_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp)
+{
+
+ kif->kf_type = KF_TYPE_UNKNOWN;
+ return (0);
+}