Uninlined most of the bloated inline functions in <sys/disklabel.h>. Some

of them need to become even larger to support devfs.

1 files changed, 18 insertions, 0 deletions

diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index 76adaa9..88f9598 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -121,6 +121,24 @@ clone_label(lp)
 	return (lp1);
 }
 
+dev_t
+dkmodpart(dev_t dev, int part)
+{
+	return (makedev(major(dev), (minor(dev) & ~7) | part));
+}
+
+dev_t
+dkmodslice(dev_t dev, int slice)
+{
+	return (makedev(major(dev), (minor(dev) & ~0x1f0000) | (slice << 16)));
+}
+
+u_int
+dkunit(dev_t dev)
+{
+	return (((minor(dev) >> 16) & 0x1e0) | ((minor(dev) >> 3) & 0x1f));
+}
+
 /*
  * Determine the size of the transfer, and make sure it is
  * within the boundaries of the partition. Adjust transfer