From owner-svn-src-releng@freebsd.org  Fri Aug 19 19:19:18 2016
Return-Path: <owner-svn-src-releng@freebsd.org>
Delivered-To: svn-src-releng@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3F553BC0FF9;
 Fri, 19 Aug 2016 19:19:18 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 0F38E1AA6;
 Fri, 19 Aug 2016 19:19:17 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7JJJH8H060910;
 Fri, 19 Aug 2016 19:19:17 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7JJJHs6060909;
 Fri, 19 Aug 2016 19:19:17 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201608191919.u7JJJHs6060909@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 19 Aug 2016 19:19:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r304495 - releng/11.0/sys/dev/filemon
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-releng@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the release engineering / security commits to
 the src tree <svn-src-releng.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-releng>, 
 <mailto:svn-src-releng-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-releng/>
List-Post: <mailto:svn-src-releng@freebsd.org>
List-Help: <mailto:svn-src-releng-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Aug 2016 19:19:18 -0000

Author: bdrewery
Date: Fri Aug 19 19:19:17 2016
New Revision: 304495
URL: https://svnweb.freebsd.org/changeset/base/304495

Log:
  MFS r304474:
  
    MFC r304008:
  
      Avoid taking PROC_LOCK in syscalls if not being traced.
  
  Approved by:	re (XXX)

Modified:
  releng/11.0/sys/dev/filemon/filemon.c
Directory Properties:
  releng/11.0/   (props changed)

Modified: releng/11.0/sys/dev/filemon/filemon.c
==============================================================================
--- releng/11.0/sys/dev/filemon/filemon.c	Fri Aug 19 19:16:10 2016	(r304494)
+++ releng/11.0/sys/dev/filemon/filemon.c	Fri Aug 19 19:19:17 2016	(r304495)
@@ -137,6 +137,8 @@ filemon_proc_get(struct proc *p)
 {
 	struct filemon *filemon;
 
+	if (p->p_filemon == NULL)
+		return (NULL);
 	PROC_LOCK(p);
 	filemon = filemon_acquire(p->p_filemon);
 	PROC_UNLOCK(p);