diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2015-09-24 19:28:34 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2015-09-24 19:28:34 +0000 |
| commit | 6716458c715d7c7867840b9e4a00d10b51a2acc3 (patch) | |
| tree | 7a02ba5b0fddf5d1d61cd6298b74d2be6bac8d70 /sys | |
| parent | b92ef175dee01861f1f9cd3a1b38edf687c918a1 (diff) | |
Move declaration of readdisksector() to disklabel.h. This makes it
available to other areas of the kernel suffering from an overburden
of buf tweaking to read a disk sector.
ok mpi@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/subr_disk.c | 4 | ||||
| -rw-r--r-- | sys/sys/disklabel.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index 59a85e1ce61..a169af5a279 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.218 2015/09/24 11:12:56 krw Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.219 2015/09/24 19:28:33 krw Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -102,8 +102,6 @@ struct disk_attach_task { void disk_attach_callback(void *); -int readdisksector(struct buf *, void (*)(struct buf *), struct disklabel *, - u_int64_t); int spoofgptlabel(struct buf *, void (*)(struct buf *), struct disklabel *); int gpt_chk_mbr(struct dos_partition *, struct disklabel *); diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h index a77b294aa0e..8ad21a3fb1c 100644 --- a/sys/sys/disklabel.h +++ b/sys/sys/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.71 2015/09/13 15:18:14 krw Exp $ */ +/* $OpenBSD: disklabel.h,v 1.72 2015/09/24 19:28:33 krw Exp $ */ /* $NetBSD: disklabel.h,v 1.41 1996/05/10 23:07:37 mark Exp $ */ /* @@ -536,6 +536,8 @@ int setdisklabel(struct disklabel *, struct disklabel *, u_int); int readdisklabel(dev_t, void (*)(struct buf *), struct disklabel *, int); int writedisklabel(dev_t, void (*)(struct buf *), struct disklabel *); int bounds_check_with_label(struct buf *, struct disklabel *); +int readdisksector(struct buf *, void (*)(struct buf *), + struct disklabel *, u_int64_t); int readdoslabel(struct buf *, void (*)(struct buf *), struct disklabel *, daddr_t *, int); #ifdef CD9660 |