[dm-devel] Changes from 2.6.3-udm2

[Joe Thornber]

--- ../../2.6.3-udm.old/source/drivers/md/Makefile	2004-02-18 14:51:57.000000000 +0000
+++ ./drivers/md/Makefile	2004-02-18 16:21:51.000000000 +0000
@@ -4,9 +4,9 @@
 
 dm-mod-objs	:= dm.o dm-table.o dm-target.o dm-linear.o dm-stripe.o \
 		   dm-ioctl.o dm-io.o kcopyd.o
+dm-multipath-objs := dm-path-selector.o dm-mpath.o
 dm-snapshot-objs := dm-snap.o dm-exception-store.o
 dm-mirror-objs	:= dm-log.o dm-raid1.o
-dm-multipath-objs := dm-path-selector.o dm-mpath.o
 raid6-objs	:= raid6main.o raid6algos.o raid6recov.o raid6tables.o \
 		   raid6int1.o raid6int2.o raid6int4.o \
 		   raid6int8.o raid6int16.o raid6int32.o \
@@ -27,9 +27,9 @@
 obj-$(CONFIG_BLK_DEV_MD)	+= md.o
 obj-$(CONFIG_BLK_DEV_DM)	+= dm-mod.o
 obj-$(CONFIG_DM_CRYPT)		+= dm-crypt.o
+obj-$(CONFIG_DM_MULTIPATH)	+= dm-multipath.o
 obj-$(CONFIG_DM_SNAPSHOT)	+= dm-snapshot.o
 obj-$(CONFIG_DM_MIRROR)		+= dm-mirror.o
-obj-$(CONFIG_DM_MULTIPATH)	+= dm-multipath.o
 obj-$(CONFIG_DM_FLAKEY)		+= dm-flakey.o
 
 quiet_cmd_unroll = UNROLL  $@
--- ../../2.6.3-udm.old/source/drivers/md/dm-flakey.c	2004-02-18 09:14:57.000000000 +0000
+++ ./drivers/md/dm-flakey.c	2004-02-18 16:23:48.000000000 +0000
@@ -12,6 +12,8 @@
 #include <linux/bio.h>
 #include <linux/slab.h>
 
+typedef typeof(jiffies) jiffy_t;
+
 /*
  * Flakey: Used for testing only, simulates intermittent,
  * catastrophic device failure.
--- ../../2.6.3-udm.old/source/drivers/md/dm-io.c	2004-02-18 09:18:18.000000000 +0000
+++ ./drivers/md/dm-io.c	2004-02-18 16:04:30.000000000 +0000
@@ -35,8 +35,6 @@
 	struct biovec_pool pools[BIOVEC_NR_POOLS];
 };
 
-/*----------------*/
-
 static void bio_set_exit(struct bio_set *bs)
 {
 	unsigned i;
@@ -58,8 +56,6 @@
 	}
 }
 
-/*----------------*/
-
 static void mk_name(char *str, size_t len, const char *prefix, unsigned count)
 {
 	int r;
@@ -144,8 +140,6 @@
 	return -ENOMEM;
 }
 
-/*----------------*/
-
 /* FIXME: blech */
 static inline unsigned bvec_index(unsigned nr)
 {
@@ -312,13 +306,12 @@
  *---------------------------------------------------------------*/
 static inline void bio_set_region(struct bio *bio, unsigned region)
 {
-//	bio->bi_io_vec[bio->bi_max_vecs - 1].bv_len = region;
+	bio->bi_io_vec[bio->bi_max_vecs - 1].bv_len = region;
 }
 
 static inline unsigned bio_get_region(struct bio *bio)
 {
-//	return bio->bi_io_vec[bio->bi_max_vecs - 1].bv_len;
-	return 0;
+	return bio->bi_io_vec[bio->bi_max_vecs - 1].bv_len;
 }
 
 /*-----------------------------------------------------------------
--- ../../2.6.3-udm.old/source/drivers/md/dm-table.c	2004-02-18 09:16:56.000000000 +0000
+++ ./drivers/md/dm-table.c	2004-02-18 15:40:07.000000000 +0000
@@ -70,6 +70,11 @@
 }
 
 /*
+ * Returns the minimum that is _not_ zero, unless both are zero.
+ */
+#define min_not_zero(l, r) (l == 0) ? r : ((r == 0) ? l : min(l, r))
+
+/*
  * Combine two io_restrictions, always taking the lower value.
  */
 static void combine_restrictions_low(struct io_restrictions *lhs,
--- ../../2.6.3-udm.old/source/drivers/md/dm.h	2004-02-18 09:13:14.000000000 +0000
+++ ./drivers/md/dm.h	2004-02-18 16:07:19.000000000 +0000
@@ -20,11 +20,6 @@
 #define DMINFO(f, x...) printk(KERN_INFO DM_NAME ": " f "\n" , ## x)
 
 /*
- * FIXME: There must be a better place for this.
- */
-typedef typeof(jiffies) jiffy_t;
-
-/*
  * FIXME: I think this should be with the definition of sector_t
  * in types.h.
  */
@@ -169,11 +164,6 @@
 }
 
 /*
- * Returns the minimum that is _not_ zero, unless both are zero.
- */
-#define min_not_zero(l, r) (l == 0) ? r : ((r == 0) ? l : min(l, r))
-
-/*
  * The device-mapper can be driven through one of two interfaces;
  * ioctl or filesystem, depending which patch you have applied.
  */