diff options
| author | Tom Rini <trini@ti.com> | 2015-02-04 13:30:00 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-04 13:30:00 -0500 |
| commit | 7f641d53bbb3a426a3bfb132d8346153e86a9d08 (patch) | |
| tree | e59a0aef74c8742a30a611342d39d7bfe06854dd /fs/ubifs/super.c | |
| parent | 112db9407dd338f71200beb0fc99dffa8dcb57a8 (diff) | |
| parent | 040cc7b3beedecd971274a065564e39aac7fc76e (diff) | |
| download | u-boot-imx-7f641d53bbb3a426a3bfb132d8346153e86a9d08.zip u-boot-imx-7f641d53bbb3a426a3bfb132d8346153e86a9d08.tar.gz u-boot-imx-7f641d53bbb3a426a3bfb132d8346153e86a9d08.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ubi
Diffstat (limited to 'fs/ubifs/super.c')
| -rw-r--r-- | fs/ubifs/super.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 01d449a..10f8fff 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -1049,7 +1049,6 @@ static void free_orphans(struct ubifs_info *c) c->orph_buf = NULL; } -#ifndef __UBOOT__ /** * free_buds - free per-bud objects. * @c: UBIFS file-system description object @@ -1061,7 +1060,6 @@ static void free_buds(struct ubifs_info *c) rbtree_postorder_for_each_entry_safe(bud, n, &c->buds, rb) kfree(bud); } -#endif /** * check_volume_empty - check if the UBI volume is empty. @@ -1242,6 +1240,7 @@ static int ubifs_parse_options(struct ubifs_info *c, char *options, return 0; } +#endif /** * destroy_journal - destroy journal data structures. @@ -1272,7 +1271,6 @@ static void destroy_journal(struct ubifs_info *c) ubifs_tnc_close(c); free_buds(c); } -#endif /** * bu_init - initialize bulk-read information. @@ -1502,11 +1500,9 @@ static int mount_ubifs(struct ubifs_info *c) if (err) goto out_lpt; -#ifndef __UBOOT__ err = ubifs_replay_journal(c); if (err) goto out_journal; -#endif /* Calculate 'min_idx_lebs' after journal replay */ c->bi.min_idx_lebs = ubifs_calc_min_idx_lebs(c); @@ -1678,10 +1674,8 @@ out_infos: spin_unlock(&ubifs_infos_lock); out_orphans: free_orphans(c); -#ifndef __UBOOT__ out_journal: destroy_journal(c); -#endif out_lpt: ubifs_lpt_free(c, 0); out_master: |