diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-08-25 18:40:29 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-08-25 18:40:29 -0400 |
| commit | e8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c (patch) | |
| tree | 31c4d7718111abddfaaa8d3fb14ab4a7e2554cd9 /fs/ext3/dir.c | |
| parent | 8b5a10fc6fd02289ea03480f93382b1a99006142 (diff) | |
| parent | c62e43202e7cf50ca24bce58b255df7bf5de69d0 (diff) | |
Merge commit 'origin/x86/urgent' into x86/asm
Diffstat (limited to 'fs/ext3/dir.c')
| -rw-r--r-- | fs/ext3/dir.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c index 3d724a95882..373fa90c796 100644 --- a/fs/ext3/dir.c +++ b/fs/ext3/dir.c | |||
| @@ -130,8 +130,7 @@ static int ext3_readdir(struct file * filp, | |||
| 130 | struct buffer_head *bh = NULL; | 130 | struct buffer_head *bh = NULL; |
| 131 | 131 | ||
| 132 | map_bh.b_state = 0; | 132 | map_bh.b_state = 0; |
| 133 | err = ext3_get_blocks_handle(NULL, inode, blk, 1, | 133 | err = ext3_get_blocks_handle(NULL, inode, blk, 1, &map_bh, 0); |
| 134 | &map_bh, 0, 0); | ||
| 135 | if (err > 0) { | 134 | if (err > 0) { |
| 136 | pgoff_t index = map_bh.b_blocknr >> | 135 | pgoff_t index = map_bh.b_blocknr >> |
| 137 | (PAGE_CACHE_SHIFT - inode->i_blkbits); | 136 | (PAGE_CACHE_SHIFT - inode->i_blkbits); |