Messages in this thread | | | Date | Sun, 20 May 2012 17:34:20 +0200 | From | Anders Larsen <> | Subject | Re: [PATCH 03/10] qnx4fs: use memweight() |
| |
On 2012-05-20 15:23:16, Akinobu Mita wrote: > Use memweight() to count the total number of bits clear in memory > area. > > Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> > Cc: Anders Larsen <al@alarsen.net> > --- > fs/qnx4/bitmap.c | 24 +++++------------------- > 1 files changed, 5 insertions(+), 19 deletions(-) > > diff --git a/fs/qnx4/bitmap.c b/fs/qnx4/bitmap.c > index 22e0d60..fc04ef1 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-
due to the missing whitespace after the macro I had to read that statement three times to comprehend it (which was probably good, since that's the beef ;)
> + memweight(bh->b_data, bytes); > brelse(bh); > - total += QNX4_BLOCK_SIZE; > + total += bytes; > offset++; > }
Other than that, Acked-by: Anders Larsen <al@alarsen.net>
Cheers Anders
| |