From owner-svn-src-all@FreeBSD.ORG  Sat Sep 25 10:31:05 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DA54A1065674;
	Sat, 25 Sep 2010 10:31:05 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C9F908FC1A;
	Sat, 25 Sep 2010 10:31:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8PAV5ff059851;
	Sat, 25 Sep 2010 10:31:05 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8PAV5xh059849;
	Sat, 25 Sep 2010 10:31:05 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201009251031.o8PAV5xh059849@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sat, 25 Sep 2010 10:31:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213164 - head/sys/geom/eli
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Sep 2010 10:31:05 -0000

Author: pjd
Date: Sat Sep 25 10:31:05 2010
New Revision: 213164
URL: http://svn.freebsd.org/changeset/base/213164

Log:
  Ignore errors from BIO_FLUSH. It might confuse users that provider wasn't
  really killed. What we really care about are write errors only.
  
  MFC after:	2 weeks

Modified:
  head/sys/geom/eli/g_eli_ctl.c

Modified: head/sys/geom/eli/g_eli_ctl.c
==============================================================================
--- head/sys/geom/eli/g_eli_ctl.c	Sat Sep 25 09:43:24 2010	(r213163)
+++ head/sys/geom/eli/g_eli_ctl.c	Sat Sep 25 10:31:05 2010	(r213164)
@@ -688,7 +688,7 @@ g_eli_ctl_delkey(struct gctl_req *req, s
 		 * Flush write cache so we don't overwrite data N times in cache
 		 * and only once on disk.
 		 */
-		g_io_flush(cp);
+		(void)g_io_flush(cp);
 	}
 	bzero(&md, sizeof(md));
 	bzero(sector, sizeof(sector));
@@ -739,13 +739,11 @@ g_eli_kill_one(struct g_eli_softc *sc)
 				if (error == 0)
 					error = err;
 			}
-			err = g_io_flush(cp);
-			if (err != 0) {
-				G_ELI_DEBUG(0, "Cannot flush %s (error=%d).",
-				    pp->name, err);
-				if (error == 0)
-					error = err;
-			}
+			/*
+			 * Flush write cache so we don't overwrite data N times
+			 * in cache and only once on disk.
+			 */
+			(void)g_io_flush(cp);
 		}
 		free(sector, M_ELI);
 	}