---

yaml
---
r: 2951
b: refs/heads/master
c: acfa182
h: refs/heads/master
i:
  2949: 85e23aa
  2947: cf581f8
  2943: 08c1478
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6e711448137ca3301512cec41a2c2ce852b3d0a
+refs/heads/master: acfa1823d33859b0db77701726c9ca5ccc6e6f25

trunk/fs/ext3/namei.c

@@ -932,8 +932,16 @@ static struct buffer_head * ext3_dx_find_entry(struct dentry *dentry,
 	struct inode *dir = dentry->d_parent->d_inode;
 
 	sb = dir->i_sb;
-	if (!(frame = dx_probe(dentry, NULL, &hinfo, frames, err)))
-		return NULL;
+	/* NFS may look up ".." - look at dx_root directory block */
+	if (namelen > 2 || name[0] != '.'||(name[1] != '.' && name[1] != '\0')){
+		if (!(frame = dx_probe(dentry, NULL, &hinfo, frames, err)))
+			return NULL;
+	} else {
+		frame = frames;
+		frame->bh = NULL;			/* for dx_release() */
+		frame->at = (struct dx_entry *)frames;	/* hack for zero entry*/
+		dx_set_block(frame->at, 0);		/* dx_root block is 0 */
+	}
 	hash = hinfo.hash;
 	do {
 		block = dx_get_block(frame->at);