From: David Woodhouse Date: Fri, 21 Apr 2006 12:16:49 +0000 (+0100) Subject: [RBTREE] Update key.c to use rb_parent() accessor macro. X-Git-Tag: v2.6.18-rc1~1104^2~8 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fed306f2baa170220b0299198a39c6be2a91bf19;p=linux-2.6 [RBTREE] Update key.c to use rb_parent() accessor macro. Signed-off-by: David Woodhouse --- diff --git a/security/keys/key.c b/security/keys/key.c index b6061fa29d..3fdc49c6a0 100644 --- a/security/keys/key.c +++ b/security/keys/key.c @@ -211,12 +211,12 @@ static inline void key_alloc_serial(struct key *key) key->serial = 2; key_serial_next = key->serial + 1; - if (!parent->rb_parent) + if (!rb_parent(parent)) p = &key_serial_tree.rb_node; - else if (parent->rb_parent->rb_left == parent) - p = &parent->rb_parent->rb_left; + else if (rb_parent(parent)->rb_left == parent) + p = &(rb_parent(parent)->rb_left); else - p = &parent->rb_parent->rb_right; + p = &(rb_parent(parent)->rb_right); parent = rb_next(parent); if (!parent)