lkml.org 
[lkml]   [2012]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] rbtree: fix jffs2 build issue due to renamed __rb_parent_color field
    When renaming rb_parent_color into __rb_parent_color to highlight the
    fact that people aren't expected to directly manipulate this, I broke
    the jffs2 build which was doing such direct manipulation in
    fs/jffs2/readinode.c . Fix this and add a comment explaining why
    this direct use is safe here.

    Signed-off-by: Michel Lespinasse <walken@google.com>
    ---
    fs/jffs2/readinode.c | 6 ++++--
    1 files changed, 4 insertions(+), 2 deletions(-)

    diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c
    index dc0437e..b00fc50 100644
    --- a/fs/jffs2/readinode.c
    +++ b/fs/jffs2/readinode.c
    @@ -395,7 +395,9 @@ static int jffs2_add_tn_to_tree(struct jffs2_sb_info *c,

    /* Trivial function to remove the last node in the tree. Which by definition
    has no right-hand -- so can be removed just by making its only child (if
    - any) take its place under its parent. */
    + any) take its place under its parent. Note that we don't maintain the
    + usual rbtree invariants as there won't be further insert or erase
    + operations on the tree.*/
    static void eat_last(struct rb_root *root, struct rb_node *node)
    {
    struct rb_node *parent = rb_parent(node);
    @@ -414,7 +416,7 @@ static void eat_last(struct rb_root *root, struct rb_node *node)
    *link = node->rb_left;
    /* Colour doesn't matter now. Only the parent pointer. */
    if (node->rb_left)
    - node->rb_left->rb_parent_color = node->rb_parent_color;
    + node->rb_left->__rb_parent_color = node->__rb_parent_color;
    }

    /* We put this in reverse order, so we can just use eat_last */
    --
    1.7.7.3

    \
     
     \ /
      Last update: 2012-07-18 14:21    [W:0.029 / U:119.796 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site