diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 01:29:38 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 01:29:38 +0100 |
| commit | 374e55251cacfb68d331bb8a574b2de8160aacc2 (patch) | |
| tree | bfd63d39be388c59157610b410003c7dcd4f0963 /fs/udf/balloc.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp (diff) | |
| parent | UDF: Fix compiler warning (diff) | |
| download | linux-374e55251cacfb68d331bb8a574b2de8160aacc2.tar.xz linux-374e55251cacfb68d331bb8a574b2de8160aacc2.zip | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
UDF: Fix compiler warning
udf: Convert UDF to new truncate calling sequence
Diffstat (limited to 'fs/udf/balloc.c')
| -rw-r--r-- | fs/udf/balloc.c | 4 |
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 @@ #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 @@ repeat: 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) |