diff options
author | Julia Lawall <julia@diku.dk> | 2010-05-22 06:00:21 -0400 |
---|---|---|
committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2010-06-12 07:46:15 -0400 |
commit | 6da5156fad495730cca9238ead566222175b30b9 (patch) | |
tree | da90bb6b4897c78e866e468236d067147ed5c150 /fs/ubifs/lpt.c | |
parent | 276de5d2a18bcdc69e6d48a4d96afc14cfef9dcb (diff) |
UBIFS: use ERR_CAST
Use ERR_CAST(x) rather than ERR_PTR(PTR_ERR(x)). The former makes more
clear what is the purpose of the operation, which otherwise looks like a
no-op.
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'fs/ubifs/lpt.c')
-rw-r--r-- | fs/ubifs/lpt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c index ad7f67b827ea..0084a33c4c69 100644 --- a/fs/ubifs/lpt.c +++ b/fs/ubifs/lpt.c | |||
@@ -1457,13 +1457,13 @@ struct ubifs_lprops *ubifs_lpt_lookup(struct ubifs_info *c, int lnum) | |||
1457 | shft -= UBIFS_LPT_FANOUT_SHIFT; | 1457 | shft -= UBIFS_LPT_FANOUT_SHIFT; |
1458 | nnode = ubifs_get_nnode(c, nnode, iip); | 1458 | nnode = ubifs_get_nnode(c, nnode, iip); |
1459 | if (IS_ERR(nnode)) | 1459 | if (IS_ERR(nnode)) |
1460 | return ERR_PTR(PTR_ERR(nnode)); | 1460 | return ERR_CAST(nnode); |
1461 | } | 1461 | } |
1462 | iip = ((i >> shft) & (UBIFS_LPT_FANOUT - 1)); | 1462 | iip = ((i >> shft) & (UBIFS_LPT_FANOUT - 1)); |
1463 | shft -= UBIFS_LPT_FANOUT_SHIFT; | 1463 | shft -= UBIFS_LPT_FANOUT_SHIFT; |
1464 | pnode = ubifs_get_pnode(c, nnode, iip); | 1464 | pnode = ubifs_get_pnode(c, nnode, iip); |
1465 | if (IS_ERR(pnode)) | 1465 | if (IS_ERR(pnode)) |
1466 | return ERR_PTR(PTR_ERR(pnode)); | 1466 | return ERR_CAST(pnode); |
1467 | iip = (i & (UBIFS_LPT_FANOUT - 1)); | 1467 | iip = (i & (UBIFS_LPT_FANOUT - 1)); |
1468 | dbg_lp("LEB %d, free %d, dirty %d, flags %d", lnum, | 1468 | dbg_lp("LEB %d, free %d, dirty %d, flags %d", lnum, |
1469 | pnode->lprops[iip].free, pnode->lprops[iip].dirty, | 1469 | 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) | |||
1586 | nnode = c->nroot; | 1586 | nnode = c->nroot; |
1587 | nnode = dirty_cow_nnode(c, nnode); | 1587 | nnode = dirty_cow_nnode(c, nnode); |
1588 | if (IS_ERR(nnode)) | 1588 | if (IS_ERR(nnode)) |
1589 | return ERR_PTR(PTR_ERR(nnode)); | 1589 | return ERR_CAST(nnode); |
1590 | i = lnum - c->main_first; | 1590 | i = lnum - c->main_first; |
1591 | shft = c->lpt_hght * UBIFS_LPT_FANOUT_SHIFT; | 1591 | shft = c->lpt_hght * UBIFS_LPT_FANOUT_SHIFT; |
1592 | for (h = 1; h < c->lpt_hght; h++) { | 1592 | 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) | |||
1594 | shft -= UBIFS_LPT_FANOUT_SHIFT; | 1594 | shft -= UBIFS_LPT_FANOUT_SHIFT; |
1595 | nnode = ubifs_get_nnode(c, nnode, iip); | 1595 | nnode = ubifs_get_nnode(c, nnode, iip); |
1596 | if (IS_ERR(nnode)) | 1596 | if (IS_ERR(nnode)) |
1597 | return ERR_PTR(PTR_ERR(nnode)); | 1597 | return ERR_CAST(nnode); |
1598 | nnode = dirty_cow_nnode(c, nnode); | 1598 | nnode = dirty_cow_nnode(c, nnode); |
1599 | if (IS_ERR(nnode)) | 1599 | if (IS_ERR(nnode)) |
1600 | return ERR_PTR(PTR_ERR(nnode)); | 1600 | return ERR_CAST(nnode); |
1601 | } | 1601 | } |
1602 | iip = ((i >> shft) & (UBIFS_LPT_FANOUT - 1)); | 1602 | iip = ((i >> shft) & (UBIFS_LPT_FANOUT - 1)); |
1603 | shft -= UBIFS_LPT_FANOUT_SHIFT; | 1603 | shft -= UBIFS_LPT_FANOUT_SHIFT; |
1604 | pnode = ubifs_get_pnode(c, nnode, iip); | 1604 | pnode = ubifs_get_pnode(c, nnode, iip); |
1605 | if (IS_ERR(pnode)) | 1605 | if (IS_ERR(pnode)) |
1606 | return ERR_PTR(PTR_ERR(pnode)); | 1606 | return ERR_CAST(pnode); |
1607 | pnode = dirty_cow_pnode(c, pnode); | 1607 | pnode = dirty_cow_pnode(c, pnode); |
1608 | if (IS_ERR(pnode)) | 1608 | if (IS_ERR(pnode)) |
1609 | return ERR_PTR(PTR_ERR(pnode)); | 1609 | return ERR_CAST(pnode); |
1610 | iip = (i & (UBIFS_LPT_FANOUT - 1)); | 1610 | iip = (i & (UBIFS_LPT_FANOUT - 1)); |
1611 | dbg_lp("LEB %d, free %d, dirty %d, flags %d", lnum, | 1611 | dbg_lp("LEB %d, free %d, dirty %d, flags %d", lnum, |
1612 | pnode->lprops[iip].free, pnode->lprops[iip].dirty, | 1612 | pnode->lprops[iip].free, pnode->lprops[iip].dirty, |