Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f644e5f authored by Dirk Behme's avatar Dirk Behme Committed by Jan Kara
Browse files

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: default avatarDirk Behme <dirk.behme@de.bosch.com>
Signed-off-by: default avatarGeorge G. Davis <gdavis@mvista.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 7e49b6f2

fs/udf/balloc.c

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#define udf_set_bit(nr, addr) ext2_set_bit(nr, addr)

#define udf_test_bit(nr, addr) ext2_test_bit(nr, addr)

#define udf_find_next_one_bit(addr, size, offset) \

		ext2_find_next_bit(addr, size, offset)

		ext2_find_next_bit((unsigned long *)(addr), size, offset)



static int read_block_bitmap(struct super_block *sb,

			     struct udf_bitmap *bitmap, unsigned int block,
@@ -297,7 +297,7 @@ static int udf_bitmap_new_block(struct super_block *sb, 
				break;

			}

		} else {

			bit = udf_find_next_one_bit((char *)bh->b_data,

			bit = udf_find_next_one_bit(bh->b_data,

						    sb->s_blocksize << 3,

						    group_start << 3);

			if (bit < sb->s_blocksize << 3)