summaryrefslogtreecommitdiffstats
path: root/fs/ubifs
diff options
context:
space:
mode:
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2010-08-04 13:50:51 +0300
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2010-08-30 10:19:06 +0300
commite3408ad4cbed6ec6990efad4c2ef0856bcd3c712 (patch)
treefb36a77d65fc077337968f53539d26544910792e /fs/ubifs
parentefe1881f5482f94f5e5e6cb74bf3ea72f2b5b9ce (diff)
UBIFS: fix assertion warning
This patch fixes the following false assertion warning: UBIFS assert failed in data_nodes_cmp at 130 (pid 15107) The assertion was wrong because it did not take into account that the node can be an xentry. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'fs/ubifs')
-rw-r--r--fs/ubifs/gc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ubifs/gc.c b/fs/ubifs/gc.c
index ee4b05de4d4..98b2c3c8725 100644
--- a/fs/ubifs/gc.c
+++ b/fs/ubifs/gc.c
@@ -178,7 +178,8 @@ int nondata_nodes_cmp(void *priv, struct list_head *a, struct list_head *b)
if (typeb == UBIFS_INO_KEY)
return 1;
- ubifs_assert(typea == UBIFS_DENT_KEY && typeb == UBIFS_DENT_KEY);
+ ubifs_assert(typea == UBIFS_DENT_KEY || typea == UBIFS_XENT_KEY);
+ ubifs_assert(typeb == UBIFS_DENT_KEY || typeb == UBIFS_XENT_KEY);
inuma = key_inum(c, &sa->key);
inumb = key_inum(c, &sb->key);