From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 11 Jun 2011 16:54:50 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.42-WIP-0702~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f36e6925f817ed5086550c97796e09905fbb234;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next
---

8f36e6925f817ed5086550c97796e09905fbb234
diff --cc lib/ext2fs/dblist.c
index 8ee61b4ce,d981f7119..c0a3dfe43
--- a/lib/ext2fs/dblist.c
+++ b/lib/ext2fs/dblist.c
@@@ -166,13 -162,13 +166,13 @@@ errcode_t ext2fs_add_dir_block2(ext2_db
  	EXT2_CHECK_MAGIC(dblist, EXT2_ET_MAGIC_DBLIST);
  
  	if (dblist->count >= dblist->size) {
 -		old_size = dblist->size * sizeof(struct ext2_db_entry);
 +		old_size = dblist->size * sizeof(struct ext2_db_entry2);
  		dblist->size += dblist->size > 200 ? dblist->size / 2 : 100;
  		retval = ext2fs_resize_mem(old_size, (size_t) dblist->size *
 -					   sizeof(struct ext2_db_entry),
 +					   sizeof(struct ext2_db_entry2),
  					   &dblist->list);
  		if (retval) {
- 			dblist->size -= 100;
 -			dblist->size = old_size / sizeof(struct ext2_db_entry);
++			dblist->size = old_size / sizeof(struct ext2_db_entry2);
  			return retval;
  		}
  	}