From 958d2e6395b678792ac26732a6888c3badeb7ded Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Fri, 21 Apr 2006 13:16:49 +0100 Subject: [PATCH] --- yaml --- r: 27935 b: refs/heads/master c: fed306f2baa170220b0299198a39c6be2a91bf19 h: refs/heads/master i: 27933: 15695b702338bde8cb84ae00f1f92ac684680067 27931: 51f6dfce935f83a5ed2a78b49d934e09fe0fc74f 27927: a4c79c36f915b9035902b61748a8bc9f1d785365 27919: 1a44230befc79b5d77984b5cf7c3a47fa34bd71d 27903: b7697a3d0268bf0863d910d45478064061c8954c v: v3 --- [refs] | 2 +- trunk/security/keys/key.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b97601d95957..34400918adac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52b5108ca7490c0609e4dbddd8439bc03d702c99 +refs/heads/master: fed306f2baa170220b0299198a39c6be2a91bf19 diff --git a/trunk/security/keys/key.c b/trunk/security/keys/key.c index b6061fa29da7..3fdc49c6a02c 100644 --- a/trunk/security/keys/key.c +++ b/trunk/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)