From patchwork Mon Nov 16 15:30:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 7628401 X-Patchwork-Delegate: axboe@kernel.dk Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3F7D4BF90C for ; Mon, 16 Nov 2015 15:31:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6A9A82051C for ; Mon, 16 Nov 2015 15:31:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 36471204D6 for ; Mon, 16 Nov 2015 15:31:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752531AbbKPPbH (ORCPT ); Mon, 16 Nov 2015 10:31:07 -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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=Dtza4o2LkhC8dVe2nn QQ4ticWemWqax/i5bbwXaSVMk=; b=CSkfMo/24JIFZ9M780im1h+aQMrOn1j5S1 T1pVThKA1Gmy87wkeqJFOgJhfqWog+eDOPmkwf255ZMI9BSPOgdLeOMKlNE6JWu3 bVVB0CFxesn5X3rCxW8fgTMeaQWRWl91vUOiJQrS2zQo4s8eKBEsJVzJx6r/WHKW pd4nr+zV4= Received: from localhost (unknown [116.77.138.167]) by smtp5 (Coremail) with SMTP id D9GowACXGrV99klWQbCQAA--.4404S3; Mon, 16 Nov 2015 23:30:07 +0800 (CST) 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-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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)