3 files changed, 7 insertions, 21 deletions

diff --git a/fs/qnx4/bitmap.c b/fs/qnx4/bitmap.c
index 22e0d60e53ef..76a7a697b778 100644
--- a/fs/qnx4/bitmap.c
+++ b/fs/qnx4/bitmap.c
@@ -17,23 +17,6 @@
 #include <linux/bitops.h>
 #include "qnx4.h"
 
-static void count_bits(register const char *bmPart, register int size,
-                       int *const tf)
-{
-        char b;
-        int tot = *tf;
-
-        if (size > QNX4_BLOCK_SIZE) {
-                size = QNX4_BLOCK_SIZE;
-        }
-        do {
-                b = *bmPart++;
-                tot += 8 - hweight8(b);
-                size--;
-        } while (size != 0);
-        *tf = tot;
-}
-
 unsigned long qnx4_count_free_blocks(struct super_block *sb)
 {
         int start = le32_to_cpu(qnx4_sb(sb)->BitMap->di_first_xtnt.xtnt_blk) - 1;
@@ -44,13 +27,16 @@ unsigned long qnx4_count_free_blocks(struct super_block *sb)
         struct buffer_head *bh;
 
         while (total < size) {
+                int bytes = min(size - total, QNX4_BLOCK_SIZE);
+
                 if ((bh = sb_bread(sb, start + offset)) == NULL) {
                         printk(KERN_ERR "qnx4: I/O error in counting free blocks\n");
                         break;
                 }
-                count_bits(bh->b_data, size - total, &total_free);
+                total_free += bytes * BITS_PER_BYTE -
+                                memweight(bh->b_data, bytes);
                 brelse(bh);
-                total += QNX4_BLOCK_SIZE;
+                total += bytes;
                 offset++;
         }
 
diff --git a/fs/qnx4/namei.c b/fs/qnx4/namei.c
index a512c0b30e8e..d024505ba007 100644
--- a/fs/qnx4/namei.c
+++ b/fs/qnx4/namei.c
@@ -95,7 +95,7 @@ static struct buffer_head *qnx4_find_entry(int len, struct inode *dir,
         return NULL;
 }
 
-struct dentry * qnx4_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
+struct dentry * qnx4_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
 {
         int ino;
         struct qnx4_inode_entry *de;
diff --git a/fs/qnx4/qnx4.h b/fs/qnx4/qnx4.h
index 244d4620189b..34e2d329c97e 100644
--- a/fs/qnx4/qnx4.h
+++ b/fs/qnx4/qnx4.h
@@ -23,7 +23,7 @@ struct qnx4_inode_info {
 };
 
 extern struct inode *qnx4_iget(struct super_block *, unsigned long);
-extern struct dentry *qnx4_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd);
+extern struct dentry *qnx4_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags);
 extern unsigned long qnx4_count_free_blocks(struct super_block *sb);
 extern unsigned long qnx4_block_map(struct inode *inode, long iblock);