From owner-svn-src-head@FreeBSD.ORG  Mon Feb 21 09:56:08 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E4F4C106566B;
	Mon, 21 Feb 2011 09:56:08 +0000 (UTC)
	(envelope-from brucec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D393F8FC0A;
	Mon, 21 Feb 2011 09:56:08 +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 p1L9u8et064565;
	Mon, 21 Feb 2011 09:56:08 GMT (envelope-from brucec@svn.freebsd.org)
Received: (from brucec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1L9u8Qp064563;
	Mon, 21 Feb 2011 09:56:08 GMT (envelope-from brucec@svn.freebsd.org)
Message-Id: <201102210956.p1L9u8Qp064563@svn.freebsd.org>
From: Bruce Cran <brucec@FreeBSD.org>
Date: Mon, 21 Feb 2011 09:56:08 +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: r218910 - head/usr.sbin/fdformat
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Feb 2011 09:56:09 -0000

Author: brucec
Date: Mon Feb 21 09:56:08 2011
New Revision: 218910
URL: http://svn.freebsd.org/changeset/base/218910

Log:
  The FD_FORM ioctl used to ignore errors from the floppy controller; now when
  it encounters an error it returns an error from the ioctl.
  Ignore any errors when using the FD_FORM ioctl.
  
  PR:	kern/103862
  MFC after:	3 days

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

Modified: head/usr.sbin/fdformat/fdformat.c
==============================================================================
--- head/usr.sbin/fdformat/fdformat.c	Mon Feb 21 09:01:34 2011	(r218909)
+++ head/usr.sbin/fdformat/fdformat.c	Mon Feb 21 09:56:08 2011	(r218910)
@@ -75,8 +75,7 @@ format_track(int fd, int cyl, int secs, 
 		f.fd_formb_secno(i) = il[i+1];
 		f.fd_formb_secsize(i) = secsize;
 	}
-	if(ioctl(fd, FD_FORM, (caddr_t)&f) < 0)
-		err(EX_OSERR, "ioctl(FD_FORM)");
+	(void)ioctl(fd, FD_FORM, (caddr_t)&f);
 }
 
 static int