---

yaml --- r: 312979 b: refs/heads/master c: de9b942 h: refs/heads/master i: 312977: c552fb4 312975: d7543bf v: v3
git-mirror · Jul 22, 2012 · 15d49aa · 15d49aa
1 parent 0eac802
commit 15d49aa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec7268ce21b379a248705548573393e4f346b20b
+refs/heads/master: de9b9422026357c878a9fa3714936be0e1388e9c
diff --git a/trunk/fs/ext3/dir.c b/trunk/fs/ext3/dir.c
@@ -300,11 +300,11 @@ loff_t ext3_dir_llseek(struct file *file, loff_t offset, int origin)
 {
 	struct inode *inode = file->f_mapping->host;
 	int dx_dir = is_dx_dir(inode);
+	loff_t htree_max = ext3_get_htree_eof(file);
 
 	if (likely(dx_dir))
 		return generic_file_llseek_size(file, offset, origin,
-					        ext3_get_htree_eof(file),
-						i_size_read(inode));
+					        htree_max, htree_max);
 	else
 		return generic_file_llseek(file, offset, origin);
 }