diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-22 14:12:32 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-22 14:12:32 -0500 |
| commit | dff243f7cb3a2ebbb09093066c1bc4a90ff5b3a4 (patch) | |
| tree | 1c63e7c2f879cd322ca785671b74b4ff796dd24c /fs/ext4/bitmap.c | |
| parent | a5e6ced58d423cb09c4fc0087dcfdb0b5deb5e1c (diff) | |
| parent | f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'fs/ext4/bitmap.c')
| -rw-r--r-- | fs/ext4/bitmap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ext4/bitmap.c b/fs/ext4/bitmap.c index 0a7a6663c19..fa3af81ac56 100644 --- a/fs/ext4/bitmap.c +++ b/fs/ext4/bitmap.c | |||
| @@ -15,10 +15,9 @@ | |||
| 15 | 15 | ||
| 16 | static const int nibblemap[] = {4, 3, 3, 2, 3, 2, 2, 1, 3, 2, 2, 1, 2, 1, 1, 0}; | 16 | static const int nibblemap[] = {4, 3, 3, 2, 3, 2, 2, 1, 3, 2, 2, 1, 2, 1, 1, 0}; |
| 17 | 17 | ||
| 18 | unsigned long ext4_count_free(struct buffer_head *map, unsigned int numchars) | 18 | unsigned int ext4_count_free(struct buffer_head *map, unsigned int numchars) |
| 19 | { | 19 | { |
| 20 | unsigned int i; | 20 | unsigned int i, sum = 0; |
| 21 | unsigned long sum = 0; | ||
| 22 | 21 | ||
| 23 | if (!map) | 22 | if (!map) |
| 24 | return 0; | 23 | return 0; |