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

- Call disk_blocksize(9) when we determine the physical block size of the

Browse Source 
media. (Will this ever be anything other than 2048?)
- bounds_check_with_label() has been fixed, so put the correct partition
  size in the default disklabel.
This commit is contained in:
scw 2006-11-25 12:03:38 +00:00
parent 512f329f66
commit e34c588b57
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: cd.c,v 1.258 2006/11/16 01:33:26 christos Exp $ */
/* $NetBSD: cd.c,v 1.259 2006/11/25 12:03:38 scw Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005 The NetBSD Foundation, Inc.
@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.258 2006/11/16 01:33:26 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.259 2006/11/25 12:03:38 scw Exp $");
#include "rnd.h"
@ -1643,21 +1643,11 @@ cdgetdefaultlabel(struct cd_softc *cd, struct disklabel *lp)
lastsession = 0;
lp->d_partitions[0].p_offset = 0;
#ifdef notyet /* have to fix bounds_check_with_label() first */
lp->d_partitions[0].p_size = lp->d_secperunit;
#else
lp->d_partitions[0].p_size =
lp->d_secperunit * (lp->d_secsize / DEV_BSIZE);
#endif
lp->d_partitions[0].p_cdsession = lastsession;
lp->d_partitions[0].p_fstype = FS_ISO9660;
lp->d_partitions[RAW_PART].p_offset = 0;
#ifdef notyet
lp->d_partitions[RAW_PART].p_size = lp->d_secperunit;
#else
lp->d_partitions[RAW_PART].p_size =
lp->d_secperunit * (lp->d_secsize / DEV_BSIZE);
#endif
lp->d_partitions[RAW_PART].p_fstype = FS_ISO9660;
lp->d_npartitions = RAW_PART + 1;
@ -2011,6 +2001,7 @@ cd_get_parms(struct cd_softc *cd, int flags)
*/
if (cd_size(cd, flags) == 0)
return (ENXIO);
disk_blocksize(&cd->sc_dk, cd->params.blksize);
return (0);
}