Commit 3ee247eb authored by Alasdair G Kergon's avatar Alasdair G Kergon Committed by Linus Torvalds

[PATCH] dm: dm-table warning fix

drivers/md/dm-table.c:500: warning: comparison of distinct pointer types lacks a cast
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4aac0a63
...@@ -508,7 +508,7 @@ int dm_get_device(struct dm_target *ti, const char *path, sector_t start, ...@@ -508,7 +508,7 @@ int dm_get_device(struct dm_target *ti, const char *path, sector_t start,
if (q->merge_bvec_fn) if (q->merge_bvec_fn)
rs->max_sectors = rs->max_sectors =
min_not_zero(rs->max_sectors, min_not_zero(rs->max_sectors,
(unsigned short)(PAGE_SIZE >> 9)); (unsigned int) (PAGE_SIZE >> 9));
rs->max_phys_segments = rs->max_phys_segments =
min_not_zero(rs->max_phys_segments, min_not_zero(rs->max_phys_segments,
......
...@@ -91,7 +91,7 @@ struct target_type { ...@@ -91,7 +91,7 @@ struct target_type {
}; };
struct io_restrictions { struct io_restrictions {
unsigned short max_sectors; unsigned int max_sectors;
unsigned short max_phys_segments; unsigned short max_phys_segments;
unsigned short max_hw_segments; unsigned short max_hw_segments;
unsigned short hardsect_size; unsigned short hardsect_size;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment