2012-10-01 10:12:57

by Davidlohr Bueso

Subject: [PATCH RESEND] 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 <[email protected]>
---
kernel/power/swap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index 3c9d764..7c33ed2 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 */
--
1.7.9.5

2012-10-15 06:59:55

by Rafael J. Wysocki

Subject: Re: [PATCH RESEND] PM/Hibernate: use rb_entry

On Monday 01 of October 2012 12:12:52 Davidlohr Bueso wrote:
> 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 <[email protected]>

I'll queue this up for v3.8 when I get back from the current trip.

Thanks,
Rafael


> ---
> kernel/power/swap.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/power/swap.c b/kernel/power/swap.c
> index 3c9d764..7c33ed2 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 */
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

2012-10-24 21:53:51

by Rafael J. Wysocki

Subject: Re: [PATCH RESEND] PM/Hibernate: use rb_entry

On Monday 01 of October 2012 12:12:52 Davidlohr Bueso wrote:
> 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 <[email protected]>

Applied to linux-pm.git/linux-next as v3.8 material.

Thanks,
Rafael


> ---
> kernel/power/swap.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/power/swap.c b/kernel/power/swap.c
> index 3c9d764..7c33ed2 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 */
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.