---

yaml --- r: 39295 b: refs/heads/master c: a86c618 h: refs/heads/master i: 39293: e7240f6 39291: ab2ab11 39287: 343e1d1 39279: 51a8bb3 39263: 0537e9f 39231: fb14e08 39167: d078a26 v: v3
git-mirror · Oct 11, 2006 · b872442 · b872442
1 parent c7fd98a
commit b872442
Show file tree

Hide file tree

Showing 13 changed files with 2,369 additions and 19 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3fcc8137ce4296ad6ab94f88bd60cbe03d21527
+refs/heads/master: a86c61812637c7dd0c57e29880cffd477b62f2e7
diff --git a/trunk/fs/ext4/Makefile b/trunk/fs/ext4/Makefile
@@ -5,7 +5,7 @@
 obj-$(CONFIG_EXT4DEV_FS) += ext4dev.o
 
 ext4dev-y	:= balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
-	   ioctl.o namei.o super.o symlink.o hash.o resize.o
+	   ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o
 
 ext4dev-$(CONFIG_EXT4DEV_FS_XATTR)	+= xattr.o xattr_user.o xattr_trusted.o
 ext4dev-$(CONFIG_EXT4DEV_FS_POSIX_ACL)	+= acl.o

diff --git a/trunk/fs/ext4/dir.c b/trunk/fs/ext4/dir.c
@@ -134,8 +134,7 @@ static int ext4_readdir(struct file * filp,
 		struct buffer_head *bh = NULL;
 
 		map_bh.b_state = 0;
-		err = ext4_get_blocks_handle(NULL, inode, blk, 1,
-						&map_bh, 0, 0);
+		err = ext4_get_blocks_wrap(NULL, inode, blk, 1, &map_bh, 0, 0);
 		if (err > 0) {
 			page_cache_readahead(sb->s_bdev->bd_inode->i_mapping,
 				&filp->f_ra,