Messages in this thread Patch in this message | | | Subject | [PATCH] PM/Hibernate: use rb_entry | From | Davidlohr Bueso <> | Date | Mon, 19 Mar 2012 00:54:45 +0100 |
| |
From: Davidlohr Bueso <dave@gnu.org>
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> --- kernel/power/swap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/power/swap.c b/kernel/power/swap.c index 8742fd0..1529b83 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c @@ -109,7 +109,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 */ @@ -175,7 +175,7 @@ void free_all_swap_pages(int swap) struct swsusp_extent *ext; unsigned long offset; - ext = container_of(node, struct swsusp_extent, node); + ext = rb_entry(node, struct swsusp_extent, node); rb_erase(node, &swsusp_extents); for (offset = ext->start; offset <= ext->end; offset++) swap_free(swp_entry(swap, offset)); -- 1.7.4.1
| |