diff options
| author | bde <bde@FreeBSD.org> | 1997-07-13 15:53:20 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-07-13 15:53:20 +0000 |
| commit | 4112123248a5db2e4c109f4ca5ad826666c7d7e7 (patch) | |
| tree | b67f272c7c150c349c3fb58dec8cc81a27b885a6 /sys/ufs | |
| parent | 9ef092d81ddba1315d96e0d6de7de895adcc9f1b (diff) | |
| download | FreeBSD-src-4112123248a5db2e4c109f4ca5ad826666c7d7e7.zip FreeBSD-src-4112123248a5db2e4c109f4ca5ad826666c7d7e7.tar.gz | |
Use the correct size for a sector in the search for a label in
readdisklabel(). Sectors may be larger than DEV_BSIZE.
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ufs/ufs_disksubr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/ufs/ufs/ufs_disksubr.c b/sys/ufs/ufs/ufs_disksubr.c index 94315de..abb14c7 100644 --- a/sys/ufs/ufs/ufs_disksubr.c +++ b/sys/ufs/ufs/ufs_disksubr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_disksubr.c 8.5 (Berkeley) 1/21/94 - * $Id$ + * $Id: ufs_disksubr.c,v 1.30 1997/02/22 09:47:45 peter Exp $ */ #include <sys/param.h> @@ -160,7 +160,7 @@ insert: * Attempt to read a disk label from a device using the indicated strategy * routine. The label must be partly set up before this: secpercyl, secsize * and anything required in the strategy routine (e.g., dummy bounds for the - * partition containing the label) must be * filled in before calling us. + * partition containing the label) must be filled in before calling us. * Returns NULL on success and an error string on failure. */ char * @@ -184,7 +184,7 @@ readdisklabel(dev, strat, lp) msg = "I/O error"; else for (dlp = (struct disklabel *)bp->b_data; dlp <= (struct disklabel *)((char *)bp->b_data + - DEV_BSIZE - sizeof(*dlp)); + lp->d_secsize - sizeof(*dlp)); dlp = (struct disklabel *)((char *)dlp + sizeof(long))) { if (dlp->d_magic != DISKMAGIC || dlp->d_magic2 != DISKMAGIC) { if (msg == NULL) |
