diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
| commit | 3b9f6cb8a1ec791be79c6c7595fea922f12d1e64 (patch) | |
| tree | 2393a448add846e6c2ed12f68106c3018b72c6a9 /fs/ext3/bitmap.c | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/ext3/bitmap.c')
| -rw-r--r-- | fs/ext3/bitmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext3/bitmap.c b/fs/ext3/bitmap.c index ce4f82b9e528..b9176eed98d1 100644 --- a/fs/ext3/bitmap.c +++ b/fs/ext3/bitmap.c | |||
| @@ -20,7 +20,7 @@ unsigned long ext3_count_free (struct buffer_head * map, unsigned int numchars) | |||
| 20 | unsigned int i; | 20 | unsigned int i; |
| 21 | unsigned long sum = 0; | 21 | unsigned long sum = 0; |
| 22 | 22 | ||
| 23 | if (!map) | 23 | if (!map) |
| 24 | return (0); | 24 | return (0); |
| 25 | for (i = 0; i < numchars; i++) | 25 | for (i = 0; i < numchars; i++) |
| 26 | sum += nibblemap[map->b_data[i] & 0xf] + | 26 | sum += nibblemap[map->b_data[i] & 0xf] + |