diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-06-01 20:04:43 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-06-01 20:04:43 +0100 |
| commit | 0477d24e2a87a9077b62298b01b031929f5cf2a2 (patch) | |
| tree | 3c9c925bbdfb1d2b77559653ef30c1b734e331ef /fs/jffs2 | |
| parent | 718ea8361b15aec5f4cb559d63ba34bc5a58d8f9 (diff) | |
| download | op-kernel-dev-0477d24e2a87a9077b62298b01b031929f5cf2a2.zip op-kernel-dev-0477d24e2a87a9077b62298b01b031929f5cf2a2.tar.gz | |
[JFFS2] Fix obsoletion of metadata nodes in jffs2_add_tn_to_tree()
We should keep the mdata node with higher version number, not just the
one we happen to find latest. Doh.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'fs/jffs2')
| -rw-r--r-- | fs/jffs2/readinode.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c index 5663e8c..12e83f6 100644 --- a/fs/jffs2/readinode.c +++ b/fs/jffs2/readinode.c @@ -229,9 +229,16 @@ static int jffs2_add_tn_to_tree(struct jffs2_sb_info *c, check anyway. */ if (!tn->fn->size) { if (rii->mdata_tn) { - /* We had a candidate mdata node already */ - dbg_readinode("kill old mdata with ver %d\n", rii->mdata_tn->version); - jffs2_kill_tn(c, rii->mdata_tn); + if (rii->mdata_tn->version < tn->version) { + /* We had a candidate mdata node already */ + dbg_readinode("kill old mdata with ver %d\n", rii->mdata_tn->version); + jffs2_kill_tn(c, rii->mdata_tn); + } else { + dbg_readinode("kill new mdata with ver %d (older than existing %d\n", + tn->version, rii->mdata_tn->version); + jffs2_kill_tn(c, tn); + return 0; + } } rii->mdata_tn = tn; dbg_readinode("keep new mdata with ver %d\n", tn->version); |
