diff --git a/[refs] b/[refs]
index 0da20c0c8980..ab2f1365c260 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4aac0a63fe8d418a2b74e43708f59380ba379a3b
+refs/heads/master: 3ee247ebce93a526f482d6bc714ce796fa85a81a
diff --git a/trunk/drivers/md/dm-table.c b/trunk/drivers/md/dm-table.c
index a6f2dc66c3db..9b1e2f5ca630 100644
--- a/trunk/drivers/md/dm-table.c
+++ b/trunk/drivers/md/dm-table.c
@@ -508,7 +508,7 @@ int dm_get_device(struct dm_target *ti, const char *path, sector_t start,
 		if (q->merge_bvec_fn)
 			rs->max_sectors =
 				min_not_zero(rs->max_sectors,
-					     (unsigned short)(PAGE_SIZE >> 9));
+					     (unsigned int) (PAGE_SIZE >> 9));
 
 		rs->max_phys_segments =
 			min_not_zero(rs->max_phys_segments,
diff --git a/trunk/include/linux/device-mapper.h b/trunk/include/linux/device-mapper.h
index 83c7d207b80e..51e0e95a421a 100644
--- a/trunk/include/linux/device-mapper.h
+++ b/trunk/include/linux/device-mapper.h
@@ -91,7 +91,7 @@ struct target_type {
 };
 
 struct io_restrictions {
-	unsigned short		max_sectors;
+	unsigned int		max_sectors;
 	unsigned short		max_phys_segments;
 	unsigned short		max_hw_segments;
 	unsigned short		hardsect_size;