--- linux-2.5.45/include/linux/blkdev.h	2002-10-30 16:42:20.000000000 -0800
+++ linux/include/linux/blkdev.h	2002-11-01 14:10:18.000000000 -0800
@@ -16,6 +16,15 @@
 struct elevator_s;
 typedef struct elevator_s elevator_t;
 
+struct io_restrictions {
+	unsigned short		max_sectors;
+	unsigned short		max_phys_segments;
+	unsigned short		max_hw_segments;
+	unsigned short		hardsect_size;
+	unsigned int		max_segment_size;
+	unsigned long		seg_boundary_mask;
+};
+
 struct request_list {
 	unsigned int count;
 	struct list_head free;
@@ -216,13 +225,7 @@
 	/*
 	 * queue settings
 	 */
-	unsigned short		max_sectors;
-	unsigned short		max_phys_segments;
-	unsigned short		max_hw_segments;
-	unsigned short		hardsect_size;
-	unsigned int		max_segment_size;
-
-	unsigned long		seg_boundary_mask;
+	struct io_restrictions	limits;
 	unsigned int		dma_alignment;
 
 	wait_queue_head_t	queue_wait;
--- linux-2.5.45/include/linux/device-mapper.h	2002-10-30 16:43:07.000000000 -0800
+++ linux/include/linux/device-mapper.h	2002-11-01 14:09:15.000000000 -0800
@@ -7,6 +7,8 @@
 #ifndef _LINUX_DEVICE_MAPPER_H
 #define _LINUX_DEVICE_MAPPER_H
 
+#include <linux/blkdev.h>
+
 #define DM_DIR "mapper"	/* Slashes not supported */
 #define DM_MAX_TYPE_NAME 16
 #define DM_NAME_LEN 128
@@ -65,15 +67,6 @@
 	dm_status_fn status;
 };
 
-struct io_restrictions {
-	unsigned short		max_sectors;
-	unsigned short		max_phys_segments;
-	unsigned short		max_hw_segments;
-	unsigned short		hardsect_size;
-	unsigned int		max_segment_size;
-	unsigned long		seg_boundary_mask;
-};
-
 struct dm_target {
 	struct dm_table *table;
 	struct target_type *type;