summaryrefslogtreecommitdiffstats
path: root/fs/ubifs/tnc.c
diff options
context:
space:
mode:
authorAnton Habegger <anton.habegger@gmail.com>2015-01-22 22:29:11 +0100
committerHeiko Schocher <hs@denx.de>2015-01-29 09:34:03 +0100
commit040cc7b3beedecd971274a065564e39aac7fc76e (patch)
tree206a5572b9d00973984fc7585b527ed7123c4654 /fs/ubifs/tnc.c
parentdc2884315d492b1eefd9d32443c1f0aa3c0a991e (diff)
downloadtalos-obmc-uboot-040cc7b3beedecd971274a065564e39aac7fc76e.tar.gz
talos-obmc-uboot-040cc7b3beedecd971274a065564e39aac7fc76e.zip
ubifs: Enable journal replay during mount
Enable ubifs_replay_journal during mount_ubifs, which was disabled before. This commit fix an issue with unrecoverable ubifs volumes after power cut. Therefor the gc.c is imported now from 1860e37 Linux 3.15 hs: added SPDX-License-Identifier for fs/ubifs/gc.c Signed-off-by: Anton Habegger <anton.habegger@gmail.com>
Diffstat (limited to 'fs/ubifs/tnc.c')
-rw-r--r--fs/ubifs/tnc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c
index 95cae548bf..e20cedda57 100644
--- a/fs/ubifs/tnc.c
+++ b/fs/ubifs/tnc.c
@@ -2827,7 +2827,6 @@ out_unlock:
return ERR_PTR(err);
}
-#ifndef __UBOOT__
/**
* tnc_destroy_cnext - destroy left-over obsolete znodes from a failed commit.
* @c: UBIFS file-system description object
@@ -2869,7 +2868,6 @@ void ubifs_tnc_close(struct ubifs_info *c)
kfree(c->ilebs);
destroy_old_idx(c);
}
-#endif
/**
* left_znode - get the znode to the left.
OpenPOWER on IntegriCloud