From 04f308ef4cb6a55ee3804ce70f478850ec9f1c3d Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Wed, 4 Aug 2010 13:50:51 +0300 Subject: [PATCH] --- yaml --- r: 212999 b: refs/heads/master c: e3408ad4cbed6ec6990efad4c2ef0856bcd3c712 h: refs/heads/master i: 212997: 0613c4238ae44947904589d712bf8b96a1cb7b5c 212995: 2dd45f90df82284fd33890471263f9751c555e93 212991: 0c478d4f5473aabada2e4f738739d42a1a13a2eb v: v3 --- [refs] | 2 +- trunk/fs/ubifs/gc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1253888430ab..dd25e2de9fe2 100644 --- 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 index ee4b05de4d48..98b2c3c8725a 100644 --- 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);