| Message ID | 56f3df3380cd7214ce0b2e151f2aa757b0eaca2c.1482205472.git.geliangtang@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 20/12/16 15:02, Geliang Tang wrote: > To make the code clearer, use rb_entry() instead of container_of() to > deal with rbtree. > > Signed-off-by: Geliang Tang <geliangtang@gmail.com> Reviewed-by: Juergen Gross <jgross@suse.com> > --- > drivers/xen/evtchn.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c > index e8c7f09..6890897 100644 > --- a/drivers/xen/evtchn.c > +++ b/drivers/xen/evtchn.c > @@ -125,7 +125,7 @@ static int add_evtchn(struct per_user_data *u, struct user_evtchn *evtchn) > while (*new) { > struct user_evtchn *this; > > - this = container_of(*new, struct user_evtchn, node); > + this = rb_entry(*new, struct user_evtchn, node); > > parent = *new; > if (this->port < evtchn->port) > @@ -157,7 +157,7 @@ static struct user_evtchn *find_evtchn(struct per_user_data *u, unsigned port) > while (node) { > struct user_evtchn *evtchn; > > - evtchn = container_of(node, struct user_evtchn, node); > + evtchn = rb_entry(node, struct user_evtchn, node); > > if (evtchn->port < port) > node = node->rb_left; >
On 20/12/16 15:02, Geliang Tang wrote: > To make the code clearer, use rb_entry() instead of container_of() to > deal with rbtree. > > Signed-off-by: Geliang Tang <geliangtang@gmail.com> Committed to xen/tip.git for-linus-4.10 Juergen > --- > drivers/xen/evtchn.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c > index e8c7f09..6890897 100644 > --- a/drivers/xen/evtchn.c > +++ b/drivers/xen/evtchn.c > @@ -125,7 +125,7 @@ static int add_evtchn(struct per_user_data *u, struct user_evtchn *evtchn) > while (*new) { > struct user_evtchn *this; > > - this = container_of(*new, struct user_evtchn, node); > + this = rb_entry(*new, struct user_evtchn, node); > > parent = *new; > if (this->port < evtchn->port) > @@ -157,7 +157,7 @@ static struct user_evtchn *find_evtchn(struct per_user_data *u, unsigned port) > while (node) { > struct user_evtchn *evtchn; > > - evtchn = container_of(node, struct user_evtchn, node); > + evtchn = rb_entry(node, struct user_evtchn, node); > > if (evtchn->port < port) > node = node->rb_left; >
diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c index e8c7f09..6890897 100644 --- a/drivers/xen/evtchn.c +++ b/drivers/xen/evtchn.c @@ -125,7 +125,7 @@ static int add_evtchn(struct per_user_data *u, struct user_evtchn *evtchn) while (*new) { struct user_evtchn *this; - this = container_of(*new, struct user_evtchn, node); + this = rb_entry(*new, struct user_evtchn, node); parent = *new; if (this->port < evtchn->port) @@ -157,7 +157,7 @@ static struct user_evtchn *find_evtchn(struct per_user_data *u, unsigned port) while (node) { struct user_evtchn *evtchn; - evtchn = container_of(node, struct user_evtchn, node); + evtchn = rb_entry(node, struct user_evtchn, node); if (evtchn->port < port) node = node->rb_left;
To make the code clearer, use rb_entry() instead of container_of() to deal with rbtree. Signed-off-by: Geliang Tang <geliangtang@gmail.com> --- drivers/xen/evtchn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)