From owner-svn-src-user@FreeBSD.ORG  Sun Jan 25 21:16:25 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 0FF00E2E;
 Sun, 25 Jan 2015 21:16:25 +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 F0C6D9E6;
 Sun, 25 Jan 2015 21:16:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0PLGOvf089353;
 Sun, 25 Jan 2015 21:16:24 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0PLGOen089352;
 Sun, 25 Jan 2015 21:16:24 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201501252116.t0PLGOen089352@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org
 using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Sun, 25 Jan 2015 21:16:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r277715 - user/pho/stress2/misc
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 &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, 25 Jan 2015 21:16:25 -0000

Author: pho
Date: Sun Jan 25 21:16:24 2015
New Revision: 277715
URL: https://svnweb.freebsd.org/changeset/base/277715

Log:
  Ignore ENOTDIR error seen with fts_close() and whitespace cleanup.
  
  Sponsored by:	 EMC / Isilon storage division

Modified:
  user/pho/stress2/misc/kevent7.sh

Modified: user/pho/stress2/misc/kevent7.sh
==============================================================================
--- user/pho/stress2/misc/kevent7.sh	Sun Jan 25 20:37:32 2015	(r277714)
+++ user/pho/stress2/misc/kevent7.sh	Sun Jan 25 21:16:24 2015	(r277715)
@@ -167,7 +167,8 @@ test(void *arg __unused)
 		}
 
 		if (fts_close(fts) == -1)
-			err(1, "fts_close()");
+			if (errno != ENOTDIR)
+				warn("fts_close()");
 		if (pipe(fds) == -1)
 			err(1, "pipe()");
 		if (socketpair(PF_UNIX, SOCK_SEQPACKET, 0, socketpr) == -1)
@@ -249,11 +250,11 @@ main(void)
 			if (pthread_create(&rp, NULL, test, NULL) != 0)
 				perror("pthread_create");
 			usleep(1000);
-			for (j = 0; j < 50; j++) 
+			for (j = 0; j < 50; j++)
 				if (pthread_create(&cp[j], NULL, calls, NULL) != 0)
 					perror("pthread_create");
 
-			for (j = 0; j < 50; j++) 
+			for (j = 0; j < 50; j++)
 				pthread_join(cp[j], NULL);
 			_exit(0);
 		}