|
@@ -1457,13 +1457,13 @@ struct ubifs_lprops *ubifs_lpt_lookup(struct ubifs_info *c, int lnum)
|
|
|
shft -= UBIFS_LPT_FANOUT_SHIFT;
|
|
|
nnode = ubifs_get_nnode(c, nnode, iip);
|
|
|
if (IS_ERR(nnode))
|
|
|
- return ERR_PTR(PTR_ERR(nnode));
|
|
|
+ return ERR_CAST(nnode);
|
|
|
}
|
|
|
iip = ((i >> shft) & (UBIFS_LPT_FANOUT - 1));
|
|
|
shft -= UBIFS_LPT_FANOUT_SHIFT;
|
|
|
pnode = ubifs_get_pnode(c, nnode, iip);
|
|
|
if (IS_ERR(pnode))
|
|
|
- return ERR_PTR(PTR_ERR(pnode));
|
|
|
+ return ERR_CAST(pnode);
|
|
|
iip = (i & (UBIFS_LPT_FANOUT - 1));
|
|
|
dbg_lp("LEB %d, free %d, dirty %d, flags %d", lnum,
|
|
|
pnode->lprops[iip].free, pnode->lprops[iip].dirty,
|
|
@@ -1586,7 +1586,7 @@ struct ubifs_lprops *ubifs_lpt_lookup_dirty(struct ubifs_info *c, int lnum)
|
|
|
nnode = c->nroot;
|
|
|
nnode = dirty_cow_nnode(c, nnode);
|
|
|
if (IS_ERR(nnode))
|
|
|
- return ERR_PTR(PTR_ERR(nnode));
|
|
|
+ return ERR_CAST(nnode);
|
|
|
i = lnum - c->main_first;
|
|
|
shft = c->lpt_hght * UBIFS_LPT_FANOUT_SHIFT;
|
|
|
for (h = 1; h < c->lpt_hght; h++) {
|
|
@@ -1594,19 +1594,19 @@ struct ubifs_lprops *ubifs_lpt_lookup_dirty(struct ubifs_info *c, int lnum)
|
|
|
shft -= UBIFS_LPT_FANOUT_SHIFT;
|
|
|
nnode = ubifs_get_nnode(c, nnode, iip);
|
|
|
if (IS_ERR(nnode))
|
|
|
- return ERR_PTR(PTR_ERR(nnode));
|
|
|
+ return ERR_CAST(nnode);
|
|
|
nnode = dirty_cow_nnode(c, nnode);
|
|
|
if (IS_ERR(nnode))
|
|
|
- return ERR_PTR(PTR_ERR(nnode));
|
|
|
+ return ERR_CAST(nnode);
|
|
|
}
|
|
|
iip = ((i >> shft) & (UBIFS_LPT_FANOUT - 1));
|
|
|
shft -= UBIFS_LPT_FANOUT_SHIFT;
|
|
|
pnode = ubifs_get_pnode(c, nnode, iip);
|
|
|
if (IS_ERR(pnode))
|
|
|
- return ERR_PTR(PTR_ERR(pnode));
|
|
|
+ return ERR_CAST(pnode);
|
|
|
pnode = dirty_cow_pnode(c, pnode);
|
|
|
if (IS_ERR(pnode))
|
|
|
- return ERR_PTR(PTR_ERR(pnode));
|
|
|
+ return ERR_CAST(pnode);
|
|
|
iip = (i & (UBIFS_LPT_FANOUT - 1));
|
|
|
dbg_lp("LEB %d, free %d, dirty %d, flags %d", lnum,
|
|
|
pnode->lprops[iip].free, pnode->lprops[iip].dirty,
|