Replaced nxdump by nodump (if the dump function gets called, then the

device must be configured, so ENXIO is a bogus errno).

Replaced zerosize by nopsize.  zerosize was a temporary alias.

5 files changed, 10 insertions, 10 deletions

diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
index 43726c5..8c43fd7 100644
--- a/sys/i386/isa/matcd/matcd.c
+++ b/sys/i386/isa/matcd/matcd.c
@@ -337,7 +337,7 @@ static char	MATCDVERSION[]="Version  1(26) 18-Oct-95";
 static char	MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank Durda IV";
 /*	The proceeding strings may not be changed*/
 
-/* $Id: matcd.c,v 1.12 1995/12/08 11:16:24 julian Exp $ */
+/* $Id: matcd.c,v 1.13 1995/12/10 13:40:42 phk Exp $ */
 
 /*---------------------------------------------------------------------------
 	Include declarations
@@ -566,7 +566,7 @@ static d_strategy_t	matcdstrategy;
 extern	struct cdevsw matcd_cdevsw;
 static struct bdevsw matcd_bdevsw = 
 	{ matcdopen,	matcdclose,	matcdstrategy,	matcdioctl,	/*17*/
-	  nxdump,	matcdsize,	0,		"matcd",
+	  nodump,	matcdsize,	0,		"matcd",
 	  &matcd_cdevsw,	-1 };
 
 static struct cdevsw matcd_cdevsw = 
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 0db6bb4..460144f 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *      $Id: cd.c,v 1.49 1995/12/08 23:22:17 phk Exp $
+ *      $Id: cd.c,v 1.50 1995/12/10 10:58:20 julian Exp $
  */
 
 #define SPLCD splbio
@@ -72,7 +72,7 @@ static	d_strategy_t	cdstrategy;
 extern	struct	cdevsw	cd_cdevsw;
 static struct bdevsw cd_bdevsw = 
 	{ cdopen,	cdclose,	cdstrategy,	cdioctl,	/*6*/
-	  nxdump,	cdsize,		0,	"cd",	&cd_cdevsw,	-1 };
+	  nodump,	cdsize,		0,	"cd",	&cd_cdevsw,	-1 };
 
 static struct cdevsw cd_cdevsw = 
 	{ cdopen,	cdclose,	rawread,	nowrite,	/*15*/
diff --git a/sys/scsi/od.c b/sys/scsi/od.c
index 7fe37b4..3418dfe 100644
--- a/sys/scsi/od.c
+++ b/sys/scsi/od.c
@@ -28,7 +28,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: od.c,v 1.6 1995/12/08 11:18:45 julian Exp $
+ *	$Id: od.c,v 1.7 1995/12/08 23:22:20 phk Exp $
  */
 
 /*
@@ -126,7 +126,7 @@ static	d_strategy_t	odstrategy;
 extern	struct cdevsw od_cdevsw;
 static struct bdevsw od_bdevsw = 
 	{ odopen,	odclose,	odstrategy,	odioctl,	/*20*/
-	  nxdump,	odsize,		0,	"od",	&od_cdevsw,	-1 };
+	  nodump,	odsize,		0,	"od",	&od_cdevsw,	-1 };
 
 static struct cdevsw od_cdevsw = 
 	{ odopen,	odclose,	rawread,	rawwrite,	/*70*/
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index a212b0a..a97c336 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- * $Id: st.c,v 1.52 1995/12/10 01:47:34 bde Exp $
+ * $Id: st.c,v 1.53 1995/12/10 10:58:30 julian Exp $
  */
 
 /*
@@ -176,7 +176,7 @@ d_strategy_t	ststrategy;
 #define BDEV_MAJOR 5
 static struct bdevsw st_bdevsw = 
 	{ stopen,	stclose,	ststrategy,	stioctl,	/*5*/
-	  nxdump,	zerosize,	0 };
+	  nodump,	nopsize,	0 };
 
 static struct cdevsw st_cdevsw = 
 	{ stopen,	stclose,	rawread,	rawwrite,	/*14*/
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index b9dc8e7..2f5895c 100644
--- a/sys/vm/vm_swap.c
+++ b/sys/vm/vm_swap.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_swap.c	8.5 (Berkeley) 2/17/94
- * $Id: vm_swap.c,v 1.29 1995/12/08 11:19:42 julian Exp $
+ * $Id: vm_swap.c,v 1.30 1995/12/08 23:23:00 phk Exp $
  */
 
 #include <sys/param.h>
@@ -58,7 +58,7 @@
 
 static struct bdevsw sw_bdevsw = 
 	{ noopen,	noclose,	swstrategy,	noioc,		/*1*/
-	  nodump,	zerosize,	NULL,	"sw",	NULL,	-1 };
+	  nodump,	nopsize,	NULL,	"sw",	NULL,	-1 };
 
 static struct cdevsw sw_cdevsw = 
 	{ nullopen,	nullclose,	rawread,	rawwrite,	/*4*/