diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-09-03 03:23:41 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-09-03 03:23:41 -0400 |
| commit | ae1ad26388228048db6a5f1056bd569ed2bbc4ec (patch) | |
| tree | 223f50677aa00eb6f2a6529099a1005c7e43c071 /fs/xfs/libxfs/xfs_dir2_node.c | |
| parent | c84b82dd3e593db217f23c60f7edae02c76a3c4c (diff) | |
| parent | 089cf7f6ecb266b6a4164919a2e69bd2f938374a (diff) | |
Merge tag 'v5.3-rc7' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/xfs/libxfs/xfs_dir2_node.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_dir2_node.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c index afcc6642690a..1fc44efc344d 100644 --- a/fs/xfs/libxfs/xfs_dir2_node.c +++ b/fs/xfs/libxfs/xfs_dir2_node.c | |||
| @@ -741,7 +741,8 @@ xfs_dir2_leafn_lookup_for_entry( | |||
| 741 | ents = dp->d_ops->leaf_ents_p(leaf); | 741 | ents = dp->d_ops->leaf_ents_p(leaf); |
| 742 | 742 | ||
| 743 | xfs_dir3_leaf_check(dp, bp); | 743 | xfs_dir3_leaf_check(dp, bp); |
| 744 | ASSERT(leafhdr.count > 0); | 744 | if (leafhdr.count <= 0) |
| 745 | return -EFSCORRUPTED; | ||
| 745 | 746 | ||
| 746 | /* | 747 | /* |
| 747 | * Look up the hash value in the leaf entries. | 748 | * Look up the hash value in the leaf entries. |