diff options
Diffstat (limited to 'fs/ubifs/recovery.c')
| -rw-r--r-- | fs/ubifs/recovery.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c index f28070cb00c..51bcf4227b2 100644 --- a/fs/ubifs/recovery.c +++ b/fs/ubifs/recovery.c | |||
| @@ -213,10 +213,10 @@ static int write_rcvrd_mst_node(struct ubifs_info *c, | |||
| 213 | mst->flags |= cpu_to_le32(UBIFS_MST_RCVRY); | 213 | mst->flags |= cpu_to_le32(UBIFS_MST_RCVRY); |
| 214 | 214 | ||
| 215 | ubifs_prepare_node(c, mst, UBIFS_MST_NODE_SZ, 1); | 215 | ubifs_prepare_node(c, mst, UBIFS_MST_NODE_SZ, 1); |
| 216 | err = ubi_leb_change(c->ubi, lnum, mst, sz, UBI_SHORTTERM); | 216 | err = ubifs_leb_change(c, lnum, mst, sz, UBI_SHORTTERM); |
| 217 | if (err) | 217 | if (err) |
| 218 | goto out; | 218 | goto out; |
| 219 | err = ubi_leb_change(c->ubi, lnum + 1, mst, sz, UBI_SHORTTERM); | 219 | err = ubifs_leb_change(c, lnum + 1, mst, sz, UBI_SHORTTERM); |
| 220 | if (err) | 220 | if (err) |
| 221 | goto out; | 221 | goto out; |
| 222 | out: | 222 | out: |
| @@ -554,8 +554,8 @@ static int fix_unclean_leb(struct ubifs_info *c, struct ubifs_scan_leb *sleb, | |||
| 554 | ubifs_pad(c, buf, pad_len); | 554 | ubifs_pad(c, buf, pad_len); |
| 555 | } | 555 | } |
| 556 | } | 556 | } |
| 557 | err = ubi_leb_change(c->ubi, lnum, sleb->buf, len, | 557 | err = ubifs_leb_change(c, lnum, sleb->buf, len, |
| 558 | UBI_UNKNOWN); | 558 | UBI_UNKNOWN); |
| 559 | if (err) | 559 | if (err) |
| 560 | return err; | 560 | return err; |
| 561 | } | 561 | } |
| @@ -939,7 +939,7 @@ static int recover_head(struct ubifs_info *c, int lnum, int offs, void *sbuf) | |||
| 939 | err = ubifs_leb_read(c, lnum, sbuf, 0, offs, 1); | 939 | err = ubifs_leb_read(c, lnum, sbuf, 0, offs, 1); |
| 940 | if (err) | 940 | if (err) |
| 941 | return err; | 941 | return err; |
| 942 | return ubi_leb_change(c->ubi, lnum, sbuf, offs, UBI_UNKNOWN); | 942 | return ubifs_leb_change(c, lnum, sbuf, offs, UBI_UNKNOWN); |
| 943 | } | 943 | } |
| 944 | 944 | ||
| 945 | return 0; | 945 | return 0; |
| @@ -1069,7 +1069,7 @@ static int clean_an_unclean_leb(struct ubifs_info *c, | |||
| 1069 | } | 1069 | } |
| 1070 | 1070 | ||
| 1071 | /* Write back the LEB atomically */ | 1071 | /* Write back the LEB atomically */ |
| 1072 | err = ubi_leb_change(c->ubi, lnum, sbuf, len, UBI_UNKNOWN); | 1072 | err = ubifs_leb_change(c, lnum, sbuf, len, UBI_UNKNOWN); |
| 1073 | if (err) | 1073 | if (err) |
| 1074 | return err; | 1074 | return err; |
| 1075 | 1075 | ||
| @@ -1470,7 +1470,7 @@ static int fix_size_in_place(struct ubifs_info *c, struct size_entry *e) | |||
| 1470 | len -= 1; | 1470 | len -= 1; |
| 1471 | len = ALIGN(len + 1, c->min_io_size); | 1471 | len = ALIGN(len + 1, c->min_io_size); |
| 1472 | /* Atomically write the fixed LEB back again */ | 1472 | /* Atomically write the fixed LEB back again */ |
| 1473 | err = ubi_leb_change(c->ubi, lnum, c->sbuf, len, UBI_UNKNOWN); | 1473 | err = ubifs_leb_change(c, lnum, c->sbuf, len, UBI_UNKNOWN); |
| 1474 | if (err) | 1474 | if (err) |
| 1475 | goto out; | 1475 | goto out; |
| 1476 | dbg_rcvry("inode %lu at %d:%d size %lld -> %lld", | 1476 | dbg_rcvry("inode %lu at %d:%d size %lld -> %lld", |
