From b81bc80d8e1d4a511a5f38da792a79ddd67ca9e2 Mon Sep 17 00:00:00 2001
From: Alasdair G Kergon <agk@redhat.com>
Date: Wed, 1 Feb 2006 03:04:55 -0800
Subject: [PATCH] --- yaml --- r: 19331 b: refs/heads/master c:
 3ee247ebce93a526f482d6bc714ce796fa85a81a h: refs/heads/master i:   19329:
 e1e94543d1a2a930e11603609b9da61742f5c261   19327:
 c0045610c8f820f73f739975e3b0864827cb5897 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/md/dm-table.c         | 2 +-
 trunk/include/linux/device-mapper.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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;