From owner-svn-src-stable@FreeBSD.ORG  Thu Feb 24 11:04:47 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8B7461065696;
	Thu, 24 Feb 2011 11:04:47 +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 7A3928FC1D;
	Thu, 24 Feb 2011 11:04:47 +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 p1OB4lmf035600;
	Thu, 24 Feb 2011 11:04:47 GMT (envelope-from brucec@svn.freebsd.org)
Received: (from brucec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OB4l8p035598;
	Thu, 24 Feb 2011 11:04:47 GMT (envelope-from brucec@svn.freebsd.org)
Message-Id: <201102241104.p1OB4l8p035598@svn.freebsd.org>
From: Bruce Cran <brucec@FreeBSD.org>
Date: Thu, 24 Feb 2011 11:04:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218995 - stable/7/usr.sbin/fdformat
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Feb 2011 11:04:47 -0000

Author: brucec
Date: Thu Feb 24 11:04:47 2011
New Revision: 218995
URL: http://svn.freebsd.org/changeset/base/218995

Log:
  MFC r218910:
  
  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

Modified:
  stable/7/usr.sbin/fdformat/fdformat.c
Directory Properties:
  stable/7/usr.sbin/fdformat/   (props changed)

Modified: stable/7/usr.sbin/fdformat/fdformat.c
==============================================================================
--- stable/7/usr.sbin/fdformat/fdformat.c	Thu Feb 24 11:03:16 2011	(r218994)
+++ stable/7/usr.sbin/fdformat/fdformat.c	Thu Feb 24 11:04:47 2011	(r218995)
@@ -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