From owner-svn-src-all@FreeBSD.ORG  Tue Sep 30 12:00:51 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 3BDBBAAA;
 Tue, 30 Sep 2014 12:00:51 +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 289C1EA7;
 Tue, 30 Sep 2014 12:00:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8UC0pss047145;
 Tue, 30 Sep 2014 12:00:51 GMT (envelope-from pjd@FreeBSD.org)
Received: (from pjd@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8UC0p7Q047144;
 Tue, 30 Sep 2014 12:00:51 GMT (envelope-from pjd@FreeBSD.org)
Message-Id: <201409301200.s8UC0p7Q047144@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pjd set sender to pjd@FreeBSD.org
 using -f
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Tue, 30 Sep 2014 12:00:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r272298 - head/sys/geom
X-SVN-Group: head
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.18-1
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/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Sep 2014 12:00:51 -0000

Author: pjd
Date: Tue Sep 30 12:00:50 2014
New Revision: 272298
URL: http://svnweb.freebsd.org/changeset/base/272298

Log:
  Be prepared that set_dumper() might fail even when resetting it or prefix
  the call with (void) to document that we intentionally ignore the return
  value - no way to handle an error in case of device disappearing.

Modified:
  head/sys/geom/geom_dev.c

Modified: head/sys/geom/geom_dev.c
==============================================================================
--- head/sys/geom/geom_dev.c	Tue Sep 30 11:51:32 2014	(r272297)
+++ head/sys/geom/geom_dev.c	Tue Sep 30 12:00:50 2014	(r272298)
@@ -396,8 +396,7 @@ g_dev_ioctl(struct cdev *dev, u_long cmd
 		break;
 	case DIOCSKERNELDUMP:
 		if (*(u_int *)data != 0) {
-			set_dumper(NULL, NULL);
-			error = 0;
+			error = set_dumper(NULL, NULL);
 			break;
 		}
 		kd.offset = 0;
@@ -616,7 +615,7 @@ g_dev_orphan(struct g_consumer *cp)
 
 	/* Reset any dump-area set on this device */
 	if (dev->si_flags & SI_DUMPDEV)
-		set_dumper(NULL, NULL);
+		(void)set_dumper(NULL, NULL);
 
 	/* Destroy the struct cdev *so we get no more requests */
 	destroy_dev_sched_cb(dev, g_dev_callback, cp);