diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-05-10 18:15:50 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-05-10 18:15:50 +0200 |
| commit | b0a89d8086577ee0b8d9eb81d7fdd07e8f7662dd (patch) | |
| tree | 2b51bac05ace287702b55858e9366059f34fa489 /fs/ubifs/misc.h | |
| parent | 5fdedd222f566b61f9e5c9278e10af777384e9b4 (diff) | |
| parent | 49b2ae70344bc3212aa268576cb15d903b32558e (diff) | |
| download | barebox-b0a89d8086577ee0b8d9eb81d7fdd07e8f7662dd.tar.gz barebox-b0a89d8086577ee0b8d9eb81d7fdd07e8f7662dd.tar.xz | |
Merge branch 'for-next/ubifs'
Diffstat (limited to 'fs/ubifs/misc.h')
| -rw-r--r-- | fs/ubifs/misc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ubifs/misc.h b/fs/ubifs/misc.h index 77429be554..82f9225657 100644 --- a/fs/ubifs/misc.h +++ b/fs/ubifs/misc.h @@ -188,7 +188,8 @@ static inline int ubifs_return_leb(struct ubifs_info *c, int lnum) */ static inline int ubifs_idx_node_sz(const struct ubifs_info *c, int child_cnt) { - return UBIFS_IDX_NODE_SZ + (UBIFS_BRANCH_SZ + c->key_len) * child_cnt; + return UBIFS_IDX_NODE_SZ + (UBIFS_BRANCH_SZ + c->key_len + c->hash_len) + * child_cnt; } /** @@ -203,7 +204,7 @@ struct ubifs_branch *ubifs_idx_branch(const struct ubifs_info *c, int bnum) { return (struct ubifs_branch *)((void *)idx->branches + - (UBIFS_BRANCH_SZ + c->key_len) * bnum); + (UBIFS_BRANCH_SZ + c->key_len + c->hash_len) * bnum); } /** |