---

yaml
---
r: 105855
b: refs/heads/master
c: 275c0a8
h: refs/heads/master
i:
  105853: 6d72116
  105851: e6b30da
  105847: f1ed8fb
  105839: 6f4f626
  105823: 5b14f45
  105791: 899a257
  105727: bd744c0
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbe5f466f6995e10a10c7ae66d6dc8608f08a6b8
+refs/heads/master: 275c0a8f1253a7542ad9726956c918d8a1f694c4

trunk/fs/ext3/namei.c

@@ -991,19 +991,21 @@ static struct buffer_head * ext3_dx_find_entry(struct dentry *dentry,
 		de = (struct ext3_dir_entry_2 *) bh->b_data;
 		top = (struct ext3_dir_entry_2 *) ((char *) de + sb->s_blocksize -
 				       EXT3_DIR_REC_LEN(0));
-		for (; de < top; de = ext3_next_entry(de))
-		if (ext3_match (namelen, name, de)) {
-			if (!ext3_check_dir_entry("ext3_find_entry",
-						  dir, de, bh,
-				  (block<<EXT3_BLOCK_SIZE_BITS(sb))
-					  +((char *)de - bh->b_data))) {
-				brelse (bh);
+		for (; de < top; de = ext3_next_entry(de)) {
+			int off = (block << EXT3_BLOCK_SIZE_BITS(sb))
+				  + ((char *) de - bh->b_data);
+
+			if (!ext3_check_dir_entry(__func__, dir, de, bh, off)) {
+				brelse(bh);
 				*err = ERR_BAD_DX_DIR;
 				goto errout;
 			}
-			*res_dir = de;
-			dx_release (frames);
-			return bh;
+
+			if (ext3_match(namelen, name, de)) {
+				*res_dir = de;
+				dx_release(frames);
+				return bh;
+			}
 		}
 		brelse (bh);
 		/* Check to see if we should continue to search */