Received: by 2002:a25:ef43:0:0:0:0:0 with SMTP id w3csp2134318ybm; Sun, 31 May 2020 09:39:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwEA0mATL1NzVu8wAsoLBEIVGTnjQcHqXOOeJoaSKZBY3ZdZoiBRlTMo+4t0j90mz4sv61h X-Received: by 2002:a50:ee04:: with SMTP id g4mr17479058eds.221.1590943176787; Sun, 31 May 2020 09:39:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590943176; cv=none; d=google.com; s=arc-20160816; b=uv+1+V9dsqr/28KNGNzFQ7NnKfas5a1+8O/7Crc3BfVmcXWfRi1CEJa6LGDEsOCl3a Dsx7tgEg292/YDEHUraiZNjtlTqYfx/lqc11ZNMgeiVi0XpagLi3XsyQy9hesIdunsX6 kBVtaQjbydClbU6upY3iRp1nAmZw60l2JPWNgmGsVeAUnMsD9kH+t5LRa01aF2izKL7Z VuB5cIUQNQU9Kgl8pES5wMjTRuzyh/nEJPdy8Nbwij4NDGlmqphjmITlH6nicMNcmZFN 6DwpuwpUpNfZhfbG60gZQFuoOiCRNEVI2z1ZMkKEzf3jNv921q7OL7hlhUYay0HoVJLG tlgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:message-id:date:to:from:subject:dkim-signature; bh=iJVjU4rwDPnmE8hHnwj5S3ufe8dG+OTautxuIMN4pfY=; b=S2VOOHM92MEzFaWmIkpLApUnT825Y1a2AEQn8PUavvhL7thadp0l1SvNNiyeyhjrpB GvpMsXU1WxmkSV00fAHARp+Gnpo+XdBDdoM214AZFBeDJBQBfJ2LIxw+OMmwxeVO8CtP 6FML+OIsM4qJ1IQEiH2Pce9fB1MJnbuWkGES1DPcNPUMwl1dOJT0tEQGnEUwCq8bxHoW dKyoE+Pq8XJ+Mdf2G2ZKSSKLiYI1v0a5/gP0Z0PzhnYuxSGmre3usT/MDPD4v4th1D78 1Hp/wUddqwSrlzA/DAKzFv0dzx2C8QR68XqcuaIWWuQ/bTyVBqH6A/U2KvcXxmXEuc0A 4v2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@yandex-team.ru header.s=default header.b=X15XYZ63; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=yandex-team.ru Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i5si9090119edq.575.2020.05.31.09.39.02; Sun, 31 May 2020 09:39:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@yandex-team.ru header.s=default header.b=X15XYZ63; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=yandex-team.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728120AbgEaQdU (ORCPT + 99 others); Sun, 31 May 2020 12:33:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725912AbgEaQdU (ORCPT ); Sun, 31 May 2020 12:33:20 -0400 Received: from forwardcorp1p.mail.yandex.net (forwardcorp1p.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b6:217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E283C061A0E; Sun, 31 May 2020 09:33:19 -0700 (PDT) Received: from mxbackcorp1g.mail.yandex.net (mxbackcorp1g.mail.yandex.net [IPv6:2a02:6b8:0:1402::301]) by forwardcorp1p.mail.yandex.net (Yandex) with ESMTP id 5A5D82E0A0D; Sun, 31 May 2020 19:33:15 +0300 (MSK) Received: from vla1-81430ab5870b.qloud-c.yandex.net (vla1-81430ab5870b.qloud-c.yandex.net [2a02:6b8:c0d:35a1:0:640:8143:ab5]) by mxbackcorp1g.mail.yandex.net (mxbackcorp/Yandex) with ESMTP id FnnZx2bYyP-XCI8SNsx; Sun, 31 May 2020 19:33:15 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1590942795; bh=iJVjU4rwDPnmE8hHnwj5S3ufe8dG+OTautxuIMN4pfY=; h=Message-ID:Date:To:From:Subject; b=X15XYZ63AITIZ7pnvj1HKf/JZsztiQh9EAlfGOcch49UUXYAxmaXZxknYju4wYMkt xnGcODda08swEUQ6nXThRJWyYWFttqF93aZCFW/44pGsfBgFUu8uvyBvxoATiEcOb9 Uv4qtRfeGb40hd1ETfRstIY7K9FCnuxVozvFiF9Q= Authentication-Results: mxbackcorp1g.mail.yandex.net; dkim=pass header.i=@yandex-team.ru Received: from dynamic-vpn.dhcp.yndx.net (dynamic-vpn.dhcp.yndx.net [2a02:6b8:b081:111::1:4]) by vla1-81430ab5870b.qloud-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id vxZdZDgham-XCW8Jfs6; Sun, 31 May 2020 19:33:12 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) Subject: [PATCH] block: really remove REQ_NOWAIT_INLINE From: Konstantin Khlebnikov To: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Jens Axboe Date: Sun, 31 May 2020 19:33:12 +0300 Message-ID: <159094279217.155550.11478547618029899022.stgit@buzz> User-Agent: StGit/0.22-39-gd257 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 7b6620d7db56 ("block: remove REQ_NOWAIT_INLINE") removed it, but some pieces left. Probably something went wrong with git merge. Signed-off-by: Konstantin Khlebnikov --- include/linux/blk_types.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index 31eb92876be7..59b2e9bd9bd8 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -322,8 +322,7 @@ enum req_flag_bits { __REQ_PREFLUSH, /* request for cache flush */ __REQ_RAHEAD, /* read ahead, can fail anytime */ __REQ_BACKGROUND, /* background IO */ - __REQ_NOWAIT, /* Don't wait if request will block */ - __REQ_NOWAIT_INLINE, /* Return would-block error inline */ + __REQ_NOWAIT, /* Don't wait if request will block */ /* * When a shared kthread needs to issue a bio for a cgroup, doing * so synchronously can lead to priority inversions as the kthread @@ -358,7 +357,6 @@ enum req_flag_bits { #define REQ_RAHEAD (1ULL << __REQ_RAHEAD) #define REQ_BACKGROUND (1ULL << __REQ_BACKGROUND) #define REQ_NOWAIT (1ULL << __REQ_NOWAIT) -#define REQ_NOWAIT_INLINE (1ULL << __REQ_NOWAIT_INLINE) #define REQ_CGROUP_PUNT (1ULL << __REQ_CGROUP_PUNT) #define REQ_NOUNMAP (1ULL << __REQ_NOUNMAP) @@ -452,13 +450,12 @@ static inline int op_stat_group(unsigned int op) typedef unsigned int blk_qc_t; #define BLK_QC_T_NONE -1U -#define BLK_QC_T_EAGAIN -2U #define BLK_QC_T_SHIFT 16 #define BLK_QC_T_INTERNAL (1U << 31) static inline bool blk_qc_t_valid(blk_qc_t cookie) { - return cookie != BLK_QC_T_NONE && cookie != BLK_QC_T_EAGAIN; + return cookie != BLK_QC_T_NONE; } static inline unsigned int blk_qc_t_to_queue_num(blk_qc_t cookie)