linux-kernel - linux-next: manual merge of the akpm tree with the ext4 tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Mon, 16 Jul 2012 16:52:27 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Theodore Ts'o" <tytso@....edu>,
	Akinobu Mita <akinobu.mita@...il.com>
Subject: linux-next: manual merge of the akpm tree with the ext4 tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
fs/ext4/bitmap.c between commit f6fb99cadcd4 ("ext4: pass a char * to
ext4_count_free() instead of a buffer_head ptr") from the ext4 tree and
commit "ext4: use memweight()" from the akpm tree.

I fixed it up (I hope - see below) and can carry the fix as necessary.

N.B. this code is now used by more that just the EXT4FS_DEBUG code.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc fs/ext4/bitmap.c
index a94b9c6,ff53d5d..0000000
--- a/fs/ext4/bitmap.c
+++ b/fs/ext4/bitmap.c
@@@ -11,18 -11,15 +11,11 @@@
  #include <linux/jbd2.h>
  #include "ext4.h"
  
- static const int nibblemap[] = {4, 3, 3, 2, 3, 2, 2, 1, 3, 2, 2, 1, 2, 1, 1, 0};
- 
 -#ifdef EXT4FS_DEBUG
 -
 -unsigned int ext4_count_free(struct buffer_head *map, unsigned int numchars)
 +unsigned int ext4_count_free(char *bitmap, unsigned int numchars)
  {
- 	unsigned int i, sum = 0;
- 
- 	for (i = 0; i < numchars; i++)
- 		sum += nibblemap[bitmap[i] & 0xf] +
- 			nibblemap[(bitmap[i] >> 4) & 0xf];
- 	return sum;
 -	return numchars * BITS_PER_BYTE - memweight(map->b_data, numchars);
++	return numchars * BITS_PER_BYTE - memweight(bitmap, numchars);
  }
  
 -#endif  /*  EXT4FS_DEBUG  */
 -
  int ext4_inode_bitmap_csum_verify(struct super_block *sb, ext4_group_t group,
  				  struct ext4_group_desc *gdp,
  				  struct buffer_head *bh, int sz)

Content of type "application/pgp-signature" skipped