svn commit: r194891 - head/sys/dev/fdc

[Joerg Wunsch]

Author: joerg
Date: Wed Jun 24 19:30:31 2009
New Revision: 194891
URL: http://svn.freebsd.org/changeset/base/194891

Log:
  With the fdc control device disappearing some 5 years ago, it is no
  longer useful for the FD_STYPE and FD_SOPTS ioctls to insist on being
  issued on a writable file descriptor.  Otherwise, there's no longer a
  chance to set the drive type or options when a read-only medium is
  present in the drive, as there is no way to obtain a writable fd then.

Modified:
  head/sys/dev/fdc/fdc.c

Modified: head/sys/dev/fdc/fdc.c
==============================================================================
--- head/sys/dev/fdc/fdc.c	Wed Jun 24 19:25:47 2009	(r194890)
+++ head/sys/dev/fdc/fdc.c	Wed Jun 24 19:30:31 2009	(r194891)
@@ -1498,8 +1498,6 @@ fd_ioctl(struct g_provider *pp, u_long c
 		return (0);
 
 	case FD_STYPE:                  /* set drive type */
-		if (!(fflag & FWRITE))
-			return (EPERM);
 		/*
 		 * Allow setting drive type temporarily iff
 		 * currently unset.  Used for fdformat so any
@@ -1521,8 +1519,6 @@ fd_ioctl(struct g_provider *pp, u_long c
 		return (0);
 
 	case FD_SOPTS:			/* set drive options */
-		if (!(fflag & FWRITE))
-			return (EPERM);
 		fd->options = *(int *)data;
 		return (0);