From 3fd6dd8a13a5356923680086cff4a401a09929ba Mon Sep 17 00:00:00 2001 From: Adrian Hunter Date: Fri, 5 Sep 2008 15:20:04 +0300 Subject: [PATCH] --- yaml --- r: 116200 b: refs/heads/master c: 2094c334fdebbcceddf21f97cb16b144707af56e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ubifs/tnc_misc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 06ec4401a7a6..471c595bff6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 625bf371c1522764fc1cf2981b041c5f9a19e894 +refs/heads/master: 2094c334fdebbcceddf21f97cb16b144707af56e diff --git a/trunk/fs/ubifs/tnc_misc.c b/trunk/fs/ubifs/tnc_misc.c index a25c1cc1f8d9..b48db999903e 100644 --- a/trunk/fs/ubifs/tnc_misc.c +++ b/trunk/fs/ubifs/tnc_misc.c @@ -480,8 +480,8 @@ int ubifs_tnc_read_node(struct ubifs_info *c, struct ubifs_zbranch *zbr, } /* Make sure the key of the read node is correct */ - key_read(c, key, &key1); - if (memcmp(node + UBIFS_KEY_OFFSET, &key1, c->key_len)) { + key_read(c, node + UBIFS_KEY_OFFSET, &key1); + if (!keys_eq(c, key, &key1)) { ubifs_err("bad key in node at LEB %d:%d", zbr->lnum, zbr->offs); dbg_tnc("looked for key %s found node's key %s",