Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3ee247ebce93a526f482d6bc714ce796fa85a81a

Authored by Alasdair G Kergon
Committed by Linus Torvalds
1 parent 4aac0a63fe
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] dm: dm-table warning fix 

drivers/md/dm-table.c:500: warning: comparison of distinct pointer types lacks a cast

Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

drivers/md/dm-table.c
Diff comments   View file @ 3ee247e
... ... @@ -508,7 +508,7 @@
508 508 if (q->merge_bvec_fn)
509 509 rs->max_sectors =
510 510 min_not_zero(rs->max_sectors,
511   - (unsigned short)(PAGE_SIZE >> 9));
  511 + (unsigned int) (PAGE_SIZE >> 9));
512 512  
513 513 rs->max_phys_segments =
514 514 min_not_zero(rs->max_phys_segments,
include/linux/device-mapper.h
Diff comments   View file @ 3ee247e
... ... @@ -91,7 +91,7 @@
91 91 };
92 92  
93 93 struct io_restrictions {
94   - unsigned short max_sectors;
  94 + unsigned int max_sectors;
95 95 unsigned short max_phys_segments;
96 96 unsigned short max_hw_segments;
97 97 unsigned short hardsect_size;