Index: sys/buf.h
===================================================================
RCS file: /cvs/src/sys/sys/buf.h,v
retrieving revision 1.97
diff -u -p -r1.97 buf.h
--- sys/buf.h	9 Jan 2015 05:04:22 -0000	1.97
+++ sys/buf.h	4 Jul 2015 11:22:23 -0000
@@ -106,12 +106,6 @@ void		 bufq_done(struct bufq *, struct b
 void		 bufq_quiesce(void);
 void		 bufq_restart(void);
 
-/* disksort */
-struct bufq_disksort {
-	struct buf	 *bqd_actf;
-	struct buf	**bqd_actb;
-};
-
 /* fifo */
 SIMPLEQ_HEAD(bufq_fifo_head, buf);
 struct bufq_fifo {
@@ -126,7 +120,6 @@ struct bufq_nscan {
 
 /* bufq link in struct buf */
 union bufq_data {
-	struct bufq_disksort	bufq_data_disksort;
 	struct bufq_fifo	bufq_data_fifo;
 	struct bufq_nscan	bufq_data_nscan;
 };
@@ -144,10 +137,6 @@ extern struct bio_ops {
 	void	(*io_movedeps)(struct buf *, struct buf *);
 	int	(*io_countdeps)(struct buf *, int, int);
 } bioops;
-
-/* XXX: disksort(); */
-#define b_actf	b_bufq.bufq_data_disksort.bqd_actf
-#define b_actb	b_bufq.bufq_data_disksort.bqd_actb
 
 /* The buffer header describes an I/O operation in the kernel. */
 struct buf {