summaryrefslogtreecommitdiffstats
path: root/fs/ubifs
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2020-12-10 10:17:09 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2020-12-10 10:22:56 +0100
commit71fe101b17ef13f764e501d2b8e516396c61f5a4 (patch)
tree47908c7f9e6e47d4ce8e5d40c355e140b03984bf /fs/ubifs
parentcee45e68b5b2b415e786216e32fe3ef0f9dbbf02 (diff)
downloadbarebox-71fe101b17ef13f764e501d2b8e516396c61f5a4.tar.gz
barebox-71fe101b17ef13f764e501d2b8e516396c61f5a4.tar.xz
ubifs: remove wrong assertion
In barebox copy_znode() doesn't make a copy of the znode, We are limited to readonly support, so copy_znode() returns the original node. tnc_delete() expects a znode to be dirty and has an assertion for this. In a normal r/w implementation this is correct, but not in barebox, so drop the assertion. Instead of removing it just comment it out to make sure it won't be added again with the next ubifs kernel synchronisation. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'fs/ubifs')
-rw-r--r--fs/ubifs/tnc.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c
index 2d7327ad84..72f9b817d8 100644
--- a/fs/ubifs/tnc.c
+++ b/fs/ubifs/tnc.c
@@ -1935,7 +1935,12 @@ static int tnc_delete(struct ubifs_info *c, struct ubifs_znode *znode, int n)
do {
ubifs_assert(c, !ubifs_zn_obsolete(znode));
- ubifs_assert(c, ubifs_zn_dirty(znode));
+ /*
+ * This assertion is invalid in barebox due to the shortcuts we take
+ * in our readonly implementation.
+ *
+ * ubifs_assert(c, ubifs_zn_dirty(znode));
+ */
zp = znode->parent;
n = znode->iip;