diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-06-16 15:29:36 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-06-16 15:29:36 -0700 |
commit | b0477f5f8ec85bf8a82f6aa6eee308d72c418032 (patch) | |
tree | d520be10a261f418dbf4539f1d2b5d48d74ba0d3 /fs/nilfs2/btree.c | |
parent | 13a29d9ad242f0bf3b31afe812c81558d54892de (diff) | |
parent | 9a004a75a3305fbd3c253f38cd0788164c4fbd56 (diff) |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-15.07-android
Diffstat (limited to 'fs/nilfs2/btree.c')
-rw-r--r-- | fs/nilfs2/btree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c index ecdbae19a766..090d8ce25bd1 100644 --- a/fs/nilfs2/btree.c +++ b/fs/nilfs2/btree.c @@ -388,7 +388,7 @@ static int nilfs_btree_root_broken(const struct nilfs_btree_node *node, nchildren = nilfs_btree_node_get_nchildren(node); if (unlikely(level < NILFS_BTREE_LEVEL_NODE_MIN || - level > NILFS_BTREE_LEVEL_MAX || + level >= NILFS_BTREE_LEVEL_MAX || nchildren < 0 || nchildren > NILFS_BTREE_ROOT_NCHILDREN_MAX)) { pr_crit("NILFS: bad btree root (inode number=%lu): level = %d, flags = 0x%x, nchildren = %d\n", |