hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ubifs: Implement ubifs_lpt_lookup using ubifs_pnode_lookup 

ubifs_lpt_lookup() starts by looking up the nth pnode in the LPT. We
already have this functionality in ubifs_pnode_lookup(). Use this
function rather than open coding its functionality.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Sascha Hauer 2018-09-07 14:36:27 +02:00 committed by Richard Weinberger
parent 0e26b6e255
commit e635cf8c3b
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/ubifs/lpt.c
View File

@ -1480,27 +1480,11 @@ struct ubifs_pnode *ubifs_pnode_lookup(struct ubifs_info *c, int i)
*/ */
struct ubifs_lprops *ubifs_lpt_lookup(struct ubifs_info *c, int lnum) struct ubifs_lprops *ubifs_lpt_lookup(struct ubifs_info *c, int lnum)
{ {
int err, i, h, iip, shft; int i, iip;
struct ubifs_nnode *nnode;
struct ubifs_pnode *pnode; struct ubifs_pnode *pnode;
if (!c->nroot) {
err = ubifs_read_nnode(c, NULL, 0);
if (err)
return ERR_PTR(err);
}
nnode = c->nroot;
i = lnum - c->main_first; i = lnum - c->main_first;
shft = c->lpt_hght * UBIFS_LPT_FANOUT_SHIFT; pnode = ubifs_pnode_lookup(c, i >> UBIFS_LPT_FANOUT_SHIFT);
for (h = 1; h < c->lpt_hght; h++) {
iip = ((i >> shft) & (UBIFS_LPT_FANOUT - 1));
shft -= UBIFS_LPT_FANOUT_SHIFT;
nnode = ubifs_get_nnode(c, nnode, iip);
if (IS_ERR(nnode))
return ERR_CAST(nnode);
}
iip = ((i >> shft) & (UBIFS_LPT_FANOUT - 1));
pnode = ubifs_get_pnode(c, nnode, iip);
if (IS_ERR(pnode)) if (IS_ERR(pnode))
return ERR_CAST(pnode); return ERR_CAST(pnode);
iip = (i & (UBIFS_LPT_FANOUT - 1)); iip = (i & (UBIFS_LPT_FANOUT - 1));