Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert cdsize() to do nothing.

This commit is contained in:
mycroft 1995-03-23 11:51:22 +00:00
parent 4712cd33dc
commit d21add8356
2 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/dev/scsipi/cd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd.c,v 1.60 1995/03/23 11:43:09 mycroft Exp $ */
/* $NetBSD: cd.c,v 1.61 1995/03/23 11:51:22 mycroft Exp $ */
/*
* Copyright (c) 1994, 1995 Charles Hannum. All rights reserved.
@ -1158,21 +1158,9 @@ int
cdsize(dev)
dev_t dev;
{
struct cd_softc *cd;
int part;
int size;
if (cdopen(dev, 0, S_IFBLK) != 0)
return -1;
cd = cdcd.cd_devs[CDUNIT(dev)];
part = CDPART(dev);
if (cd->sc_dk.dk_label.d_partitions[part].p_fstype != FS_SWAP)
size = -1;
else
size = cd->sc_dk.dk_label.d_partitions[part].p_size;
if (cdclose(dev, 0, S_IFBLK) != 0)
return -1;
return size;
/* CD-ROMs are read-only. */
return -1;
}
int

18
sys/scsi/cd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd.c,v 1.60 1995/03/23 11:43:09 mycroft Exp $ */
/* $NetBSD: cd.c,v 1.61 1995/03/23 11:51:22 mycroft Exp $ */
/*
* Copyright (c) 1994, 1995 Charles Hannum. All rights reserved.
@ -1158,21 +1158,9 @@ int
cdsize(dev)
dev_t dev;
{
struct cd_softc *cd;
int part;
int size;
if (cdopen(dev, 0, S_IFBLK) != 0)
return -1;
cd = cdcd.cd_devs[CDUNIT(dev)];
part = CDPART(dev);
if (cd->sc_dk.dk_label.d_partitions[part].p_fstype != FS_SWAP)
size = -1;
else
size = cd->sc_dk.dk_label.d_partitions[part].p_size;
if (cdclose(dev, 0, S_IFBLK) != 0)
return -1;
return size;
/* CD-ROMs are read-only. */
return -1;
}
int