[JFFS2] Extend jffs2_link_node_ref() to link into per-inode list too.

Let's avoid the potential for forgetting to set ref->next_in_ino, by doing
it within jffs2_link_node_ref() instead.

This highlights the ugliness of what we're currently doing with
xattr_datum and xattr_ref structures -- we should find a nicer way of
dealing with that.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

1 files changed, 2 insertions, 4 deletions

diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
index 45e3573cf107..62f685faeba8 100644
--- a/fs/jffs2/wbuf.c
+++ b/fs/jffs2/wbuf.c
@@ -312,9 +312,8 @@ static void jffs2_wbuf_recover(struct jffs2_sb_info *c)
                                         return;
 
                                 raw2->flash_offset = ofs | REF_OBSOLETE;
-                                raw2->next_in_ino = NULL;
 
-                                jffs2_add_physical_node_ref(c, raw2, ref_totlen(c, jeb, *first_raw));
+                                jffs2_add_physical_node_ref(c, raw2, ref_totlen(c, jeb, *first_raw), NULL);
                         }
                         return;
                 }
@@ -507,11 +506,10 @@ static int __jffs2_flush_wbuf(struct jffs2_sb_info *c, int pad)
                         return -ENOMEM;
                 ref->flash_offset = c->wbuf_ofs + c->wbuf_len;
                 ref->flash_offset |= REF_OBSOLETE;
-                ref->next_in_ino = NULL;
 
                 spin_lock(&c->erase_completion_lock);
 
-                jffs2_link_node_ref(c, jeb, ref, waste);
+                jffs2_link_node_ref(c, jeb, ref, waste, NULL);
                 /* FIXME: that made it count as dirty. Convert to wasted */
                 jeb->dirty_size -= waste;
                 c->dirty_size -= waste;