On Fri, Dec 18, 2015 at 4:33 PM, Geliang Tang <geliangtang@xxxxxxx> wrote:
> Use list_for_each_entry_safe() instead of list_for_each_safe() to
> simplify the code.
>
> Signed-off-by: Geliang Tang <geliangtang@xxxxxxx>
> ---
> net/ceph/messenger.c | 14 +++++---------
> 1 file changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
> index 9981039..c664b7f 100644
> --- a/net/ceph/messenger.c
> +++ b/net/ceph/messenger.c
> @@ -3361,9 +3361,8 @@ static void ceph_msg_free(struct ceph_msg *m)
> static void ceph_msg_release(struct kref *kref)
> {
> struct ceph_msg *m = container_of(kref, struct ceph_msg, kref);
> - LIST_HEAD(data);
> - struct list_head *links;
> - struct list_head *next;
> + LIST_HEAD(head);
> + struct ceph_msg_data *data, *next;
>
> dout("%s %p\n", __func__, m);
> WARN_ON(!list_empty(&m->list_head));
> @@ -3376,12 +3375,9 @@ static void ceph_msg_release(struct kref *kref)
> m->middle = NULL;
> }
>
> - list_splice_init(&m->data, &data);
> - list_for_each_safe(links, next, &data) {
> - struct ceph_msg_data *data;
> -
> - data = list_entry(links, struct ceph_msg_data, links);
> - list_del_init(links);
> + list_splice_init(&m->data, &head);
> + list_for_each_entry_safe(data, next, &head, links) {
> + list_del_init(&data->links);
> ceph_msg_data_destroy(data);
> }
> m->data_length = 0;
Applied. I killed the call to list_splice_init() along with its
list_head while at it.
Thanks,
Ilya
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
