diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-22 11:16:31 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-22 11:16:31 +0100 |
| commit | c04ee7fcbfba1471af90cf6407370efc779c1243 (patch) | |
| tree | c0c37c40beb8bd197b7f424a67f12487960c4882 /fs/ext3/namei.c | |
| parent | e0749524b57019f480ad6c581431589d053e0cb0 (diff) | |
| parent | 0f4a56e16d5fc9028b62ba529177a3109513e111 (diff) | |
Merge tag 'v3.10.2' into linux-linaro-lsklsk
This is the 3.10.2 stable release
Diffstat (limited to 'fs/ext3/namei.c')
| -rw-r--r-- | fs/ext3/namei.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c index 692de13e359..cea8ecf3e76 100644 --- a/fs/ext3/namei.c +++ b/fs/ext3/namei.c @@ -576,11 +576,8 @@ static int htree_dirblock_to_tree(struct file *dir_file, if (!ext3_check_dir_entry("htree_dirblock_to_tree", dir, de, bh, (block<<EXT3_BLOCK_SIZE_BITS(dir->i_sb)) +((char *)de - bh->b_data))) { - /* On error, skip the f_pos to the next block. */ - dir_file->f_pos = (dir_file->f_pos | - (dir->i_sb->s_blocksize - 1)) + 1; - brelse (bh); - return count; + /* silently ignore the rest of the block */ + break; } ext3fs_dirhash(de->name, de->name_len, hinfo); if ((hinfo->hash < start_hash) || |