From owner-svn-src-head@freebsd.org  Fri May 27 23:58:01 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 C6630B4A23E;
 Fri, 27 May 2016 23:58:01 +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 712FB17C6;
 Fri, 27 May 2016 23:58:01 +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 u4RNw0lp017790;
 Fri, 27 May 2016 23:58:00 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4RNw0kn017789;
 Fri, 27 May 2016 23:58:00 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201605272358.u4RNw0kn017789@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, 27 May 2016 23:58:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r300893 - head/sys/dev/filemon
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 May 2016 23:58:02 -0000

Author: bdrewery
Date: Fri May 27 23:58:00 2016
New Revision: 300893
URL: https://svnweb.freebsd.org/changeset/base/300893

Log:
  Don't truncate existing error when writing the log.
  
  Suggested by:	markj
  MFC after:	2 weeks
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/dev/filemon/filemon_wrapper.c

Modified: head/sys/dev/filemon/filemon_wrapper.c
==============================================================================
--- head/sys/dev/filemon/filemon_wrapper.c	Fri May 27 23:57:57 2016	(r300892)
+++ head/sys/dev/filemon/filemon_wrapper.c	Fri May 27 23:58:00 2016	(r300893)
@@ -66,7 +66,7 @@ filemon_output(struct filemon *filemon, 
 		bwillwrite();
 
 	error = fo_write(filemon->fp, &auio, filemon->cred, 0, curthread);
-	if (error != 0)
+	if (error != 0 && filemon->error == 0)
 		filemon->error = error;
 }