diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-01-11 03:41:39 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 03:41:39 +0100 |
| commit | abede81c4fb2e3b85d8760f25e3da39d2c69a134 (patch) | |
| tree | 26c893ec108d837eb9171d678c55a1cea7b22af4 /fs/ext4/bitmap.c | |
| parent | rcu: fix bug in rcutorture system-shutdown code (diff) | |
| parent | Linux 2.6.29-rc1 (diff) | |
| download | wireguard-linux-abede81c4fb2e3b85d8760f25e3da39d2c69a134.tar.xz wireguard-linux-abede81c4fb2e3b85d8760f25e3da39d2c69a134.zip | |
Merge commit 'v2.6.29-rc1' into core/urgent
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 0a7a6663c190..fa3af81ac565 100644 --- a/fs/ext4/bitmap.c +++ b/fs/ext4/bitmap.c @@ -15,10 +15,9 @@ static const int nibblemap[] = {4, 3, 3, 2, 3, 2, 2, 1, 3, 2, 2, 1, 2, 1, 1, 0}; -unsigned long ext4_count_free(struct buffer_head *map, unsigned int numchars) +unsigned int ext4_count_free(struct buffer_head *map, unsigned int numchars) { - unsigned int i; - unsigned long sum = 0; + unsigned int i, sum = 0; if (!map) return 0; |