diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
| commit | f20e3b5fe7ead0615309433260b9784d8da0bbbd (patch) | |
| tree | eabb2e47a0355ac4e8024b7087b4e7cb9f324358 /fs/ubifs/tnc_misc.c | |
| parent | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff) | |
| parent | f030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff) | |
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'fs/ubifs/tnc_misc.c')
| -rw-r--r-- | fs/ubifs/tnc_misc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ubifs/tnc_misc.c b/fs/ubifs/tnc_misc.c index a25c1cc1f8d9..b48db999903e 100644 --- a/fs/ubifs/tnc_misc.c +++ b/fs/ubifs/tnc_misc.c | |||
| @@ -480,8 +480,8 @@ int ubifs_tnc_read_node(struct ubifs_info *c, struct ubifs_zbranch *zbr, | |||
| 480 | } | 480 | } |
| 481 | 481 | ||
| 482 | /* Make sure the key of the read node is correct */ | 482 | /* Make sure the key of the read node is correct */ |
| 483 | key_read(c, key, &key1); | 483 | key_read(c, node + UBIFS_KEY_OFFSET, &key1); |
| 484 | if (memcmp(node + UBIFS_KEY_OFFSET, &key1, c->key_len)) { | 484 | if (!keys_eq(c, key, &key1)) { |
| 485 | ubifs_err("bad key in node at LEB %d:%d", | 485 | ubifs_err("bad key in node at LEB %d:%d", |
| 486 | zbr->lnum, zbr->offs); | 486 | zbr->lnum, zbr->offs); |
| 487 | dbg_tnc("looked for key %s found node's key %s", | 487 | dbg_tnc("looked for key %s found node's key %s", |