Commit 10bcee14 authored by Geliang Tang's avatar Geliang Tang Committed by Ilya Dryomov

libceph: use list_for_each_entry_safe

Use list_for_each_entry_safe() instead of list_for_each_safe() to
simplify the code.
Signed-off-by: default avatarGeliang Tang <geliangtang@163.com>
[idryomov@gmail.com: nuke call to list_splice_init() as well]
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 99c88e69
...@@ -3358,9 +3358,7 @@ static void ceph_msg_free(struct ceph_msg *m) ...@@ -3358,9 +3358,7 @@ static void ceph_msg_free(struct ceph_msg *m)
static void ceph_msg_release(struct kref *kref) static void ceph_msg_release(struct kref *kref)
{ {
struct ceph_msg *m = container_of(kref, struct ceph_msg, kref); struct ceph_msg *m = container_of(kref, struct ceph_msg, kref);
LIST_HEAD(data); struct ceph_msg_data *data, *next;
struct list_head *links;
struct list_head *next;
dout("%s %p\n", __func__, m); dout("%s %p\n", __func__, m);
WARN_ON(!list_empty(&m->list_head)); WARN_ON(!list_empty(&m->list_head));
...@@ -3373,12 +3371,8 @@ static void ceph_msg_release(struct kref *kref) ...@@ -3373,12 +3371,8 @@ static void ceph_msg_release(struct kref *kref)
m->middle = NULL; m->middle = NULL;
} }
list_splice_init(&m->data, &data); list_for_each_entry_safe(data, next, &m->data, links) {
list_for_each_safe(links, next, &data) { list_del_init(&data->links);
struct ceph_msg_data *data;
data = list_entry(links, struct ceph_msg_data, links);
list_del_init(links);
ceph_msg_data_destroy(data); ceph_msg_data_destroy(data);
} }
m->data_length = 0; m->data_length = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment