Merge branch 'v2.6.25-rc3-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / include / linux / device-mapper.h

diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index e765e191663dde89ecc150639d2d4eee1096ae88..cb784579956bb35a3f11abde8178ce6ba2da1e44 100644 (file)
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -110,15 +110,15 @@ struct target_type {
 };
 
 struct io_restrictions {
-       unsigned int            max_sectors;
-       unsigned short          max_phys_segments;
-       unsigned short          max_hw_segments;
-       unsigned short          hardsect_size;
-       unsigned int            max_segment_size;
-       unsigned int            max_hw_sectors;
-       unsigned long           seg_boundary_mask;
-       unsigned long           bounce_pfn;
-       unsigned char           no_cluster; /* inverted so that 0 is default */
+       unsigned long bounce_pfn;
+       unsigned long seg_boundary_mask;
+       unsigned max_hw_sectors;
+       unsigned max_sectors;
+       unsigned max_segment_size;
+       unsigned short hardsect_size;
+       unsigned short max_hw_segments;
+       unsigned short max_phys_segments;
+       unsigned char no_cluster; /* inverted so that 0 is default */
 };
 
 struct dm_target {