Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753420AbbKPNrK (ORCPT ); Mon, 16 Nov 2015 08:47:10 -0500 Received: from m50-138.163.com ([123.125.50.138]:39817 "EHLO m50-138.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752815AbbKPNrG (ORCPT ); Mon, 16 Nov 2015 08:47:06 -0500 From: Geliang Tang To: Ilya Dryomov , "Yan, Zheng" , Sage Weil , "David S. Miller" Cc: Geliang Tang , ceph-devel@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] libceph: use list_next_entry instead of list_entry_next Date: Mon, 16 Nov 2015 21:46:32 +0800 Message-Id: X-Mailer: git-send-email 2.5.0 In-Reply-To: <6a47dadb3a625d7f5b20b4e98bb8af4d30db66a3.1447681244.git.geliangtang@163.com> References: <6a47dadb3a625d7f5b20b4e98bb8af4d30db66a3.1447681244.git.geliangtang@163.com> In-Reply-To: <6a47dadb3a625d7f5b20b4e98bb8af4d30db66a3.1447681244.git.geliangtang@163.com> References: <6a47dadb3a625d7f5b20b4e98bb8af4d30db66a3.1447681244.git.geliangtang@163.com> X-CM-TRANSID: C9GowACXoZFE3klW_h2sAA--.70S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7Zw1kKr1kWrW7Zr1fCF4kZwb_yoW8Xw1xpF Wakr4UG34vkan7JF48X3Z7Cr42vF15KF1I9ry5Gay5J3ZxGr40yr17GryrGF40vrs7u3WY va1jyr4Uurs7Ja7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UWOJ5UUUUU= X-Originating-IP: [116.77.138.167] X-CM-SenderInfo: 5jhoxtpqjwt0rj6rljoofrz/1tbiNQq0mVSIKKQROAAAsr Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1730 Lines: 49 list_next_entry has been defined in list.h, so I replace list_entry_next with it. Signed-off-by: Geliang Tang --- 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 #include -#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; } -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/