From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752604AbbKPPbJ (ORCPT ); Mon, 16 Nov 2015 10:31:09 -0500 Received: from m50-135.163.com ([123.125.50.135]:47847 "EHLO m50-135.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752259AbbKPPbG (ORCPT ); Mon, 16 Nov 2015 10:31:06 -0500 From: Geliang Tang To: Jens Axboe Cc: Geliang Tang , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] elevator: use list_{first,prev,next}_entry Date: Mon, 16 Nov 2015 23:30:00 +0800 Message-Id: <1447687800-7087-1-git-send-email-geliangtang@163.com> X-Mailer: git-send-email 2.5.0 X-CM-TRANSID: D9GowACXGrV99klWQbCQAA--.4404S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7ur13AryrKry7CryUJF1DZFb_yoW8Wr17pF W5AayYka18Gr48CFy8CrW7uFsI9r17ury7trn7tw4rKrsaqrsFv3WYvF1UZrZ3ArWkuF43 WF1Dta9rZr42q37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UonQUUUUUU= X-Originating-IP: [116.77.138.167] X-CM-SenderInfo: 5jhoxtpqjwt0rj6rljoofrz/1tbiNR+0mVSIKKVomAAAsm Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To make the intention clearer, use list_{first,prev,next}_entry instead of list_entry. Signed-off-by: Geliang Tang --- block/noop-iosched.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/block/noop-iosched.c b/block/noop-iosched.c index 3de89d4..a163c48 100644 --- a/block/noop-iosched.c +++ b/block/noop-iosched.c @@ -21,10 +21,10 @@ static void noop_merged_requests(struct request_queue *q, struct request *rq, static int noop_dispatch(struct request_queue *q, int force) { struct noop_data *nd = q->elevator->elevator_data; + struct request *rq; - if (!list_empty(&nd->queue)) { - struct request *rq; - rq = list_entry(nd->queue.next, struct request, queuelist); + rq = list_first_entry_or_null(&nd->queue, struct request, queuelist); + if (rq) { list_del_init(&rq->queuelist); elv_dispatch_sort(q, rq); return 1; @@ -46,7 +46,7 @@ noop_former_request(struct request_queue *q, struct request *rq) if (rq->queuelist.prev == &nd->queue) return NULL; - return list_entry(rq->queuelist.prev, struct request, queuelist); + return list_prev_entry(rq, queuelist); } static struct request * @@ -56,7 +56,7 @@ noop_latter_request(struct request_queue *q, struct request *rq) if (rq->queuelist.next == &nd->queue) return NULL; - return list_entry(rq->queuelist.next, struct request, queuelist); + return list_next_entry(rq, queuelist); } static int noop_init_queue(struct request_queue *q, struct elevator_type *e) -- 2.5.0