diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2008-07-20 13:46:17 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2008-07-20 13:46:17 +0000 |
| commit | bcd5ceb03cdecf7e2e4c89e2868d641ca85f484d (patch) | |
| tree | 4b44e03dc00681321b534ebaba0732ab67cedab3 | |
| parent | 15bd4b0ec0b1b18743ab3adb83ca953ba7f0782a (diff) | |
Nuke unused readbsdlabel() function.
ok jsing@
| -rw-r--r-- | sys/arch/sgi/sgi/disksubr.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/sys/arch/sgi/sgi/disksubr.c b/sys/arch/sgi/sgi/disksubr.c index 60a44c8f74a..9926730f4ae 100644 --- a/sys/arch/sgi/sgi/disksubr.c +++ b/sys/arch/sgi/sgi/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.7 2008/07/20 13:40:27 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.8 2008/07/20 13:46:16 krw Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -40,36 +40,10 @@ #include <sys/syslog.h> #include <sys/disk.h> -char *readbsdlabel(struct buf *, void (*)(struct buf *), int, int, - int, struct disklabel *, int); char *readsgilabel(struct buf *, void (*)(struct buf *), struct disklabel *, int *, int); /* - * Try to read a standard BSD disklabel at a certain sector. - */ -char * -readbsdlabel(struct buf *bp, void (*strat)(struct buf *), - int cyl, int sec, int off, struct disklabel *lp, - int spoofonly) -{ - /* don't read the on-disk label if we are in spoofed-only mode */ - if (spoofonly) - return (NULL); - - bp->b_blkno = sec; - bp->b_bcount = lp->d_secsize; - bp->b_flags = B_BUSY | B_READ | B_RAW; - (*strat)(bp); - - /* if successful, locate disk label within block and validate */ - if (biowait(bp)) - return ("disk label I/O error"); - - return checkdisklabel(bp->b_data + LABELOFFSET, lp); -} - -/* * Attempt to read a disk label from a device * using the indicated strategy routine. * The label must be partly set up before this: |