Lift min_not_zero to dm.h
--- diff/drivers/md/dm-table.c	2004-02-18 09:04:00.000000000 +0000
+++ source/drivers/md/dm-table.c	2004-02-18 09:08:48.000000000 +0000
@@ -70,11 +70,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))
-
-/*
  * Combine two io_restrictions, always taking the lower value.
  */
 static void combine_restrictions_low(struct io_restrictions *lhs,
--- diff/drivers/md/dm.h	2004-02-18 09:07:03.000000000 +0000
+++ source/drivers/md/dm.h	2004-02-18 09:08:48.000000000 +0000
@@ -164,6 +164,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))
+
+/*
  * The device-mapper can be driven through one of two interfaces;
  * ioctl or filesystem, depending which patch you have applied.
  */