ext4: remove useless test and assignment in strtohash functions (918dc9d0) · Commits · 戴 / test

On transformation of str to hash, computed value is initialised before first byte modulo 4. But it is already initialised before entering loop and after processing last byte modulo 4. So the corresponding test and initialisation could be removed. Signed-off-by:

Damien Guibouret <damien.guibouret@partition-saving.com> Signed-off-by:

Theodore Ts'o <tytso@mit.edu>

fs/ext4/hash.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -148,8 +148,6 @@ static void str2hashbuf_signed(const char msg, int len, __u32 buf, int num)
	if (len > num*4)		if (len > num*4)
	len = num * 4;		len = num * 4;
	for (i = 0; i < len; i++) {		for (i = 0; i < len; i++) {
	if ((i % 4) == 0)
	val = pad;
	val = ((int) scp[i]) + (val << 8);		val = ((int) scp[i]) + (val << 8);
	if ((i % 4) == 3) {		if ((i % 4) == 3) {
	*buf++ = val;		*buf++ = val;
	@@ -176,8 +174,6 @@ static void str2hashbuf_unsigned(const char msg, int len, __u32 buf, int num)
	if (len > num*4)		if (len > num*4)
	len = num * 4;		len = num * 4;
	for (i = 0; i < len; i++) {		for (i = 0; i < len; i++) {
	if ((i % 4) == 0)
	val = pad;
	val = ((int) ucp[i]) + (val << 8);		val = ((int) ucp[i]) + (val << 8);
	if ((i % 4) == 3) {		if ((i % 4) == 3) {
	*buf++ = val;		*buf++ = val;

Admin message