From patchwork Mon May 2 23:17:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Callahan X-Patchwork-Id: 8995951 Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 59D9D9F1C1 for ; Mon, 2 May 2016 23:17:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8D8B52024D for ; Mon, 2 May 2016 23:17:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A6B01201F2 for ; Mon, 2 May 2016 23:17:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755259AbcEBXRN (ORCPT ); Mon, 2 May 2016 19:17:13 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:24907 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755258AbcEBXRM convert rfc822-to-8bit (ORCPT ); Mon, 2 May 2016 19:17:12 -0400 Received: from pps.filterd (m0001255.ppops.net [127.0.0.1]) by mx0b-00082601.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u42NE4Ju013185; Mon, 2 May 2016 16:17:08 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=from : to : cc : subject : date : message-id : content-type : content-id : content-transfer-encoding : mime-version; s=facebook; bh=sBONYJv4njYinoRffXJq4oQJ0voUxRLovRHnbQeijGs=; b=bysMP8zuzvOjKQldFC2BODzQGUJp5N8IfGiC3eqZ2ZVBeq6vExm10gmLtairvnjvLBWj kgt+X5ism2rWlUPEllKGOyzifhto1nhnxXeELSH+FiwPat2JeMGZM7rBTqhERwIcTYJI oSiKwQo5rnNB2SAoZl9vPuw/BdZfR1Adezg= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0b-00082601.pphosted.com with ESMTP id 22mrh8gmub-2 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 02 May 2016 16:17:08 -0700 Received: from PRN-CHUB19.TheFacebook.com (192.168.16.73) by PRN-CHUB02.TheFacebook.com (192.168.16.12) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 2 May 2016 16:17:06 -0700 Received: from PRN-MBX02-1.TheFacebook.com ([169.254.2.77]) by PRN-CHUB19.TheFacebook.com ([fe80::143:941d:8f95:c768%13]) with mapi id 14.03.0248.002; Mon, 2 May 2016 16:17:06 -0700 From: Michael Callahan To: "linux-block@vger.kernel.org" CC: Jens Axboe , Michael Callahan Subject: [PATCH 1/1] block: Minor blk_account_io_start usage cleanup Thread-Topic: [PATCH 1/1] block: Minor blk_account_io_start usage cleanup Thread-Index: AQHRpMi97P9Bny7/UUqNfZ3tTwq1yw== Date: Mon, 2 May 2016 23:17:05 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [192.168.52.123] Content-ID: <83833CBDEF6F6144B46E9566B2D6E4CF@fb.com> MIME-Version: 1.0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-05-02_15:, , signatures=0 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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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 blk_account_io_start does not need to be wrapped with blk_do_io_stat as it already checks for that condition. Signed-off-by: Michael Callahan --- static inline bool hctx_allow_merges(struct blk_mq_hw_ctx *hctx) -- To unsubscribe from this list: send the line "unsubscribe linux-block" 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/block/blk-mq.c b/block/blk-mq.c index 1699baf..0c2ed83 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1122,8 +1122,7 @@ static void blk_mq_bio_to_request(struct request *rq, struct bio *bio) { init_request_from_bio(rq, bio); - if (blk_do_io_stat(rq)) - blk_account_io_start(rq, 1); + blk_account_io_start(rq, 1); }