aboutsummaryrefslogtreecommitdiffstats
path: root/fs/udf
diff options
context:
space:
mode:
authorDirk Behme <dirk.behme@de.bosch.com>2011-02-22 14:04:19 -0500
committerJan Kara <jack@suse.cz>2011-02-23 05:00:44 -0500
commit6f644e5f97cc8dcb8dc7133562159cc20d27c38f (patch)
treeaae2f46cf203f9889b31dc400a20bfb01c9db8a1 /fs/udf
parent7e49b6f2480cb9a9e7322a91592e56a5c85361f5 (diff)
UDF: Fix compiler warning
Fix compiler warning fs/udf/balloc.c: In function 'udf_bitmap_new_block': fs/udf/balloc.c:273: warning: passing argument 1 of '_find_next_bit_le' from incompatible pointer type fs/udf/balloc.c:285: warning: passing argument 1 of '_find_next_bit_le' from incompatible pointer type fs/udf/balloc.c:311: warning: passing argument 1 of '_find_next_bit_le' from incompatible pointer type fs/udf/balloc.c:325: warning: passing argument 1 of '_find_next_bit_le' from incompatible pointer type The main fix is to add a cast in ext2_find_next_bit(). As all other usage locations of udf_find_next_one_bit() directly use bh->b_data (which is a char *), the useless (char *) cast in line 311 can be removed, too. Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com> Signed-off-by: George G. Davis <gdavis@mvista.com> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf')
-rw-r--r--fs/udf/balloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
index 306ee39ef2c3..8994dd041660 100644
--- a/fs/udf/balloc.c
+++ b/fs/udf/balloc.c
@@ -31,7 +31,7 @@
31#define udf_set_bit(nr, addr) ext2_set_bit(nr, addr) 31#define udf_set_bit(nr, addr) ext2_set_bit(nr, addr)
32#define udf_test_bit(nr, addr) ext2_test_bit(nr, addr) 32#define udf_test_bit(nr, addr) ext2_test_bit(nr, addr)
33#define udf_find_next_one_bit(addr, size, offset) \ 33#define udf_find_next_one_bit(addr, size, offset) \
34 ext2_find_next_bit(addr, size, offset) 34 ext2_find_next_bit((unsigned long *)(addr), size, offset)
35 35
36static int read_block_bitmap(struct super_block *sb, 36static int read_block_bitmap(struct super_block *sb,
37 struct udf_bitmap *bitmap, unsigned int block, 37 struct udf_bitmap *bitmap, unsigned int block,
@@ -297,7 +297,7 @@ repeat:
297 break; 297 break;
298 } 298 }
299 } else { 299 } else {
300 bit = udf_find_next_one_bit((char *)bh->b_data, 300 bit = udf_find_next_one_bit(bh->b_data,
301 sb->s_blocksize << 3, 301 sb->s_blocksize << 3,
302 group_start << 3); 302 group_start << 3);
303 if (bit < sb->s_blocksize << 3) 303 if (bit < sb->s_blocksize << 3)