From: Davidlohr Bueso <dave@gnu.org>
Date: Mon, 22 Oct 2012 23:21:09 +0000 (+0200)
Subject: PM / Hibernate: use rb_entry
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8316bd72c0248adbb9572abf2dd045a95f682bcd;p=linux.git

PM / Hibernate: use rb_entry

Since the software suspend extents are organized in an rbtree, use rb_entry
instead of container_of, as it is semantically more appropriate in order to
get a node as it is iterated.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index 3c9d764eb0d8a..7c33ed2004108 100644
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -126,7 +126,7 @@ static int swsusp_extents_insert(unsigned long swap_offset)
 
 	/* Figure out where to put the new node */
 	while (*new) {
-		ext = container_of(*new, struct swsusp_extent, node);
+		ext = rb_entry(*new, struct swsusp_extent, node);
 		parent = *new;
 		if (swap_offset < ext->start) {
 			/* Try to merge */