---

yaml --- r: 212999 b: refs/heads/master c: e3408ad h: refs/heads/master i: 212997: 0613c42 212995: 2dd45f9 212991: 0c478d4 v: v3
git-mirror · Aug 30, 2010 · 04f308e · 04f308e
1 parent c89b143
commit 04f308e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efe1881f5482f94f5e5e6cb74bf3ea72f2b5b9ce
+refs/heads/master: e3408ad4cbed6ec6990efad4c2ef0856bcd3c712
diff --git a/trunk/fs/ubifs/gc.c b/trunk/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);