summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-04-21 13:16:49 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2006-04-21 13:16:49 +0100
commitfed306f2baa170220b0299198a39c6be2a91bf19 (patch)
tree366ad7c6f8029608587d5e45738f8c229c3ff924 /security
parent52b5108ca7490c0609e4dbddd8439bc03d702c99 (diff)
downloadlinux-3.10-fed306f2baa170220b0299198a39c6be2a91bf19.tar.gz
linux-3.10-fed306f2baa170220b0299198a39c6be2a91bf19.tar.bz2
linux-3.10-fed306f2baa170220b0299198a39c6be2a91bf19.zip
[RBTREE] Update key.c to use rb_parent() accessor macro.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'security')
-rw-r--r--security/keys/key.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/security/keys/key.c b/security/keys/key.c
index b6061fa29da..3fdc49c6a02 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)