diff options
| author | Sage Weil <sage@newdream.net> | 2010-02-18 10:40:25 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-02-18 10:40:25 -0800 |
| commit | eb9bbff08c35a99f82c5b414b833cec4321c4167 (patch) | |
| tree | 5063cdf9059e1d8aad9b42cb1229944eceed5337 /fs/qnx4/bitmap.c | |
| parent | 2c27c9a57c93a0757b9b4b0e7dc1abeaf1db1ce2 (diff) | |
| parent | 716c28c0bc8bcbdd26e819f38dfc8fdfaafc0289 (diff) | |
Merge remote branch 'vfs/write_inode' into for-next
Conflicts:
Documentation/ioctl/ioctl-number.txt
Diffstat (limited to 'fs/qnx4/bitmap.c')
| -rw-r--r-- | fs/qnx4/bitmap.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/fs/qnx4/bitmap.c b/fs/qnx4/bitmap.c index 0afba069d567..22e0d60e53ef 100644 --- a/fs/qnx4/bitmap.c +++ b/fs/qnx4/bitmap.c @@ -17,13 +17,6 @@ #include <linux/bitops.h> #include "qnx4.h" -#if 0 -int qnx4_new_block(struct super_block *sb) -{ - return 0; -} -#endif /* 0 */ - static void count_bits(register const char *bmPart, register int size, int *const tf) { @@ -35,22 +28,7 @@ static void count_bits(register const char *bmPart, register int size, } do { b = *bmPart++; - if ((b & 1) == 0) - tot++; - if ((b & 2) == 0) - tot++; - if ((b & 4) == 0) - tot++; - if ((b & 8) == 0) - tot++; - if ((b & 16) == 0) - tot++; - if ((b & 32) == 0) - tot++; - if ((b & 64) == 0) - tot++; - if ((b & 128) == 0) - tot++; + tot += 8 - hweight8(b); size--; } while (size != 0); *tf = tot; @@ -67,7 +45,7 @@ unsigned long qnx4_count_free_blocks(struct super_block *sb) while (total < size) { if ((bh = sb_bread(sb, start + offset)) == NULL) { - printk("qnx4: I/O error in counting free blocks\n"); + printk(KERN_ERR "qnx4: I/O error in counting free blocks\n"); break; } count_bits(bh->b_data, size - total, &total_free); |