From owner-svn-src-all@freebsd.org  Thu Sep 28 15:58:42 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 F38ACE02216;
 Thu, 28 Sep 2017 15:58:42 +0000 (UTC) (envelope-from mav@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 C116A63C27;
 Thu, 28 Sep 2017 15:58:42 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8SFwfK5026296;
 Thu, 28 Sep 2017 15:58:41 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8SFwf4H026295;
 Thu, 28 Sep 2017 15:58:41 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201709281558.v8SFwf4H026295@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 28 Sep 2017 15:58:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324086 - head/usr.sbin/diskinfo
X-SVN-Group: head
X-SVN-Commit-Author: mav
X-SVN-Commit-Paths: head/usr.sbin/diskinfo
X-SVN-Commit-Revision: 324086
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Sep 2017 15:58:43 -0000

Author: mav
Date: Thu Sep 28 15:58:41 2017
New Revision: 324086
URL: https://svnweb.freebsd.org/changeset/base/324086

Log:
  Alike to ZFS disable cache flush after first ENOTSUP error.
  
  MFC after:	1 week

Modified:
  head/usr.sbin/diskinfo/diskinfo.c

Modified: head/usr.sbin/diskinfo/diskinfo.c
==============================================================================
--- head/usr.sbin/diskinfo/diskinfo.c	Thu Sep 28 15:23:38 2017	(r324085)
+++ head/usr.sbin/diskinfo/diskinfo.c	Thu Sep 28 15:58:41 2017	(r324086)
@@ -630,7 +630,7 @@ slogbench(int fd, int isreg, off_t mediasize, u_int se
 {
 	off_t off;
 	u_int size;
-	int error, n, N;
+	int error, n, N, nowritecache = 0;
 
 	printf("Synchronous random writes:\n");
 	for (size = sectorsize; size <= MAXTX; size *= 2) {
@@ -641,12 +641,18 @@ slogbench(int fd, int isreg, off_t mediasize, u_int se
 			for (n = 0; n < 250; n++) {
 				off = random() % (mediasize / size);
 				parwrite(fd, size, off * size);
+				if (nowritecache)
+					continue;
 				if (isreg)
 					error = fsync(fd);
 				else
 					error = ioctl(fd, DIOCGFLUSH);
-				if (error < 0)
-					err(EX_IOERR, "Flush error");
+				if (error < 0) {
+					if (errno == ENOTSUP)
+						nowritecache = 1;
+					else
+						err(EX_IOERR, "Flush error");
+				}
 			}
 			N += 250;
 		} while (delta_t() < 1.0);