diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-05 22:10:52 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-05 22:10:52 +0100 |
commit | 13efdbecc65ef6ec4028551fb223dea5c5e3143c (patch) | |
tree | 634a2ce082abe3eb2a5defe0f1ddc2f3eb10f085 /fs/ext3/dir.c | |
parent | 61f4a10cb4e9447a85245c63b3e7f46e09299fed (diff) | |
parent | 6fd210a9cc398ecbff7bcdbe220651b73b654f56 (diff) |
Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-stable
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, struct buffer_head *bh = NULL; map_bh.b_state = 0; - err = ext3_get_blocks_handle(NULL, inode, blk, 1, - &map_bh, 0, 0); + err = ext3_get_blocks_handle(NULL, inode, blk, 1, &map_bh, 0); if (err > 0) { pgoff_t index = map_bh.b_blocknr >> (PAGE_CACHE_SHIFT - inode->i_blkbits); |