| Message ID | b6930bdf479389886e7b999d207419836893af78.1447681244.git.geliangtang@163.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, Nov 16, 2015 at 2:46 PM, Geliang Tang <geliangtang@163.com> wrote: > list_next_entry has been defined in list.h, so I replace list_entry_next > with it. > > Signed-off-by: Geliang Tang <geliangtang@163.com> > --- > net/ceph/messenger.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c > index 9981039..b1d1489 100644 > --- a/net/ceph/messenger.c > +++ b/net/ceph/messenger.c > @@ -23,9 +23,6 @@ > #include <linux/ceph/pagelist.h> > #include <linux/export.h> > > -#define list_entry_next(pos, member) \ > - list_entry(pos->member.next, typeof(*pos), member) > - > /* > * Ceph uses the messenger to exchange ceph_msg messages with other > * hosts in the system. The messenger provides ordered and reliable > @@ -1042,7 +1039,7 @@ static bool ceph_msg_data_pagelist_advance(struct ceph_msg_data_cursor *cursor, > /* Move on to the next page */ > > BUG_ON(list_is_last(&cursor->page->lru, &pagelist->head)); > - cursor->page = list_entry_next(cursor->page, lru); > + cursor->page = list_next_entry(cursor->page, lru); > cursor->last_piece = cursor->resid <= PAGE_SIZE; > > return true; > @@ -1166,7 +1163,7 @@ static bool ceph_msg_data_advance(struct ceph_msg_data_cursor *cursor, > if (!cursor->resid && cursor->total_resid) { > WARN_ON(!cursor->last_piece); > BUG_ON(list_is_last(&cursor->data->links, cursor->data_head)); > - cursor->data = list_entry_next(cursor->data, links); > + cursor->data = list_next_entry(cursor->data, links); > __ceph_msg_data_cursor_init(cursor); > new_piece = true; > } Applied. Thanks, Ilya -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 9981039..b1d1489 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -23,9 +23,6 @@ #include <linux/ceph/pagelist.h> #include <linux/export.h> -#define list_entry_next(pos, member) \ - list_entry(pos->member.next, typeof(*pos), member) - /* * Ceph uses the messenger to exchange ceph_msg messages with other * hosts in the system. The messenger provides ordered and reliable @@ -1042,7 +1039,7 @@ static bool ceph_msg_data_pagelist_advance(struct ceph_msg_data_cursor *cursor, /* Move on to the next page */ BUG_ON(list_is_last(&cursor->page->lru, &pagelist->head)); - cursor->page = list_entry_next(cursor->page, lru); + cursor->page = list_next_entry(cursor->page, lru); cursor->last_piece = cursor->resid <= PAGE_SIZE; return true; @@ -1166,7 +1163,7 @@ static bool ceph_msg_data_advance(struct ceph_msg_data_cursor *cursor, if (!cursor->resid && cursor->total_resid) { WARN_ON(!cursor->last_piece); BUG_ON(list_is_last(&cursor->data->links, cursor->data_head)); - cursor->data = list_entry_next(cursor->data, links); + cursor->data = list_next_entry(cursor->data, links); __ceph_msg_data_cursor_init(cursor); new_piece = true; }
list_next_entry has been defined in list.h, so I replace list_entry_next with it. Signed-off-by: Geliang Tang <geliangtang@163.com> --- net/ceph/messenger.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)