From patchwork Fri Feb 28 15:05:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 11412437 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C6239138D for ; Fri, 28 Feb 2020 15:06:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A5965246B4 for ; Fri, 28 Feb 2020 15:06:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="GzsEM8jv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726872AbgB1PGG (ORCPT ); Fri, 28 Feb 2020 10:06:06 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:40353 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726805AbgB1PGF (ORCPT ); Fri, 28 Feb 2020 10:06:05 -0500 Received: by mail-pl1-f193.google.com with SMTP id y1so1349011plp.7 for ; Fri, 28 Feb 2020 07:06:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.ionos.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZlBfuXtP5k02GMiIbPSOAEi56vHJXlT1WiKn/fekYvs=; b=GzsEM8jv8UN0hv1bdw2lhxTiSYF+0+jdAb0JhSGNXn5SI+I2jIoXnXot9KW1SwU0uL vokIFTCNZ1R21Npfe7uHyWSabzwk1SFkUUYNpAENS9jKb8FyApr6xQPjmuKfFaEzWff4 /UhvnVJeCtLRFdOHSFMSsLSoSPZTQUIGQMgnJeALpegUBrIDM0hL2HZERItTDiT3NP3A 9w1bQKOdgXMElyCa9eIjD9qnR0YFwmysIYDUfh4YAuH/hEaePls+MZGK7RqCJzVS6ZQH SpqWlNIU5d3Dt92kKnQtGeTaVjgjrP0cCS0Z9TGU4lwJIr0ysETGJ/s3s9nF+o7tvwJU tx+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZlBfuXtP5k02GMiIbPSOAEi56vHJXlT1WiKn/fekYvs=; b=fP6m7j6KRFfu9EtHIH7vZZW2qTrYb2VfOIbbKNOWtBZ5o4biiczEac6mZuX8ZFZ7OQ Mu0XHfIRBMmSlkngopoDlzalR3Au9B+LPOEHb/x1Lc6NiHOX3oGuawJMctf7VIhJghBH jZ0KrTRY/DQbfiZou26N7MvdLax5xX/3oBpY0FHcWiGaWw8FyNHk+nGKW+8klSC7t3qO tWe1fYpzvxtWsZ9JPIA8nbbHKPPwiwNrrIjJypJyGFmniIT0EF0kwLbvt2EflGaP1KHX GLjlKyrm34le6roIQyoKRdFKc5QjuxWhY5qf6pLti0yIQfWTpcgm3TRFYSBMZ4TmqyMb seEQ== X-Gm-Message-State: APjAAAWVzV39z5ELCOypiRqP04I6hS77XD4LFxhNxZ5wE92tkBRvEA2n mZ9/aZQJ20Rm+BdoMDjqIDtX19dqn4jM00Je X-Google-Smtp-Source: APXvYqzAoXpCPtf9Ukg9y39Au4yGkEmQTnrgp2R9a119EP/Obutqur9sqVu4XtF5ye+XQPEZZvGyxg== X-Received: by 2002:a17:90a:c388:: with SMTP id h8mr5001156pjt.83.1582902364809; Fri, 28 Feb 2020 07:06:04 -0800 (PST) Received: from nb01257.pb.local ([240e:82:3:5b12:940:b7e:a31d:58eb]) by smtp.gmail.com with ESMTPSA id y1sm7621912pgs.74.2020.02.28.07.05.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 07:06:04 -0800 (PST) From: Guoqing Jiang To: axboe@kernel.dk Cc: linux-block@vger.kernel.org, Guoqing Jiang Subject: [PATCH 1/6] block: fix comment for blk_cloned_rq_check_limits Date: Fri, 28 Feb 2020 16:05:13 +0100 Message-Id: <20200228150518.10496-2-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200228150518.10496-1-guoqing.jiang@cloud.ionos.com> References: <20200228150518.10496-1-guoqing.jiang@cloud.ionos.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Since the later description mentioned "checked against the new queue limits", so make the change to avoid confusion. Reviewed-by: Bart Van Assche Signed-off-by: Guoqing Jiang Reviewed-by: Chaitanya Kulkarni --- block/blk-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/blk-core.c b/block/blk-core.c index 089e890ab208..fd43266029be 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1203,7 +1203,7 @@ EXPORT_SYMBOL(submit_bio); /** * blk_cloned_rq_check_limits - Helper function to check a cloned request - * for new the queue limits + * for the new queue limits * @q: the queue * @rq: the request being checked * From patchwork Fri Feb 28 15:05:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 11412439 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9B2CA138D for ; Fri, 28 Feb 2020 15:06:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E53A246AE for ; Fri, 28 Feb 2020 15:06:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="VHQur06E" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726970AbgB1PGO (ORCPT ); Fri, 28 Feb 2020 10:06:14 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:33585 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726805AbgB1PGN (ORCPT ); Fri, 28 Feb 2020 10:06:13 -0500 Received: by mail-pl1-f193.google.com with SMTP id ay11so1365728plb.0 for ; Fri, 28 Feb 2020 07:06:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.ionos.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hoQ5Sz2fU5fHT68nNmiSfIc2yIcVxnWhwaZSaLfQ2j8=; b=VHQur06E+DNjGY7awwcX5lv+fmrIB+h6VmgNbZCsU9ZtkKCi8OQkDxDI520ZZ4ca7B 3aC5SUv44YoKjouyhUxupXjBCzQDn35mlj4Ofic4t11hJtFFCBj/dYQfEcDksPCeVH94 G7FFPvf0A3pMXLBit3xUYvh2eDz92GZMGvEWu+5PDNtU8dPW/xSKVlg6YAy42YEsQqJS NGOR+tOCK0WstgnTQkeWUB2jn+X5FnVn+aXDw8iLNoB3vtvEmiQeNC50mNvcwUZrzsoL ja5y21ovsoqFxQQIr4Ix6r2du+wpKfUApqjhvGWbg9IBoafwxxz6KZINbPpMw3Q08poc 9qow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hoQ5Sz2fU5fHT68nNmiSfIc2yIcVxnWhwaZSaLfQ2j8=; b=l4tM3n0Cdq46gryj9ROAoPfUQimWObrqvhvMqTav3G2AsJ3zkxakBTAs/hls5iUtC9 wrIExpIdzM6TTaO7LvcK9D8ziOoNXmIbOB/2hKXE3wvYBKbCEqPahmX4jHoTlp0qilpN SkmfXKgd+MZ8QmZAHPJfg6jECh8EW54CpT/nfXg7hsB3WIdl7hzKmCl0gOGvzOy4rkY/ 4tQndBO26Y112HmTiJ4GorlNyNNVXyYIlXv163aT16SE7+BIKGOE0q1A3ZPw06FhJqmq 0IpjJTeTM9E0j6Kb1wBAD62NYQo0gRY0M6JnEoPgOquRVxS3hovlvhaGppNvJxMmHOGC oJBg== X-Gm-Message-State: APjAAAWLFmUOFtjZ2YKs12sSRd5jXgcYxBgREudijh8RI8I8hP7lixeT 6kjLsm3+Ng/tpZn9MbDoNFJYc46ewWhgwWOS X-Google-Smtp-Source: APXvYqy/n9t9tXFZ7iewlt2XEpnok/lB9H69Lp9QAqmX4w/EkAZ6DgjXLnPaiGoz0Uez5FCIb0PC/g== X-Received: by 2002:a17:902:c154:: with SMTP id 20mr4441080plj.112.1582902372807; Fri, 28 Feb 2020 07:06:12 -0800 (PST) Received: from nb01257.pb.local ([240e:82:3:5b12:940:b7e:a31d:58eb]) by smtp.gmail.com with ESMTPSA id y1sm7621912pgs.74.2020.02.28.07.06.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 07:06:12 -0800 (PST) From: Guoqing Jiang To: axboe@kernel.dk Cc: linux-block@vger.kernel.org, Guoqing Jiang Subject: [PATCH 2/6] block: use bio_{wouldblock,io}_error in direct_make_request Date: Fri, 28 Feb 2020 16:05:14 +0100 Message-Id: <20200228150518.10496-3-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200228150518.10496-1-guoqing.jiang@cloud.ionos.com> References: <20200228150518.10496-1-guoqing.jiang@cloud.ionos.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Use the two functions to simplify code. Signed-off-by: Guoqing Jiang Reviewed-by: Nikolay Borisov Reviewed-by: Bart Van Assche Reviewed-by: Chaitanya Kulkarni --- block/blk-core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index fd43266029be..6d36c2ad40ba 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1121,10 +1121,9 @@ blk_qc_t direct_make_request(struct bio *bio) if (unlikely(blk_queue_enter(q, nowait ? BLK_MQ_REQ_NOWAIT : 0))) { if (nowait && !blk_queue_dying(q)) - bio->bi_status = BLK_STS_AGAIN; + bio_wouldblock_error(bio); else - bio->bi_status = BLK_STS_IOERR; - bio_endio(bio); + bio_io_error(bio); return BLK_QC_T_NONE; } From patchwork Fri Feb 28 15:05:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 11412441 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E58DC13A4 for ; Fri, 28 Feb 2020 15:06:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B7588246AE for ; Fri, 28 Feb 2020 15:06:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="QM3+t/It" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726969AbgB1PGX (ORCPT ); Fri, 28 Feb 2020 10:06:23 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:37874 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726805AbgB1PGX (ORCPT ); Fri, 28 Feb 2020 10:06:23 -0500 Received: by mail-pg1-f194.google.com with SMTP id z12so1668037pgl.4 for ; Fri, 28 Feb 2020 07:06:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.ionos.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=syM+mD+FEQQ9t/H4a+6C6wVoDM4rV6ydwN4nhDRJ5r8=; b=QM3+t/ItT8OM1ccTogoMuGduUXCDcb5dWMhFBqioGwQo9IQQG/Vk6ZzE11/t/1Cny/ Tj4I0tpgyYquMKgb5FisK3LPZjYTz07jzyTHJDkNp9uBcKCEHezZ8HeLgmoDRxqR0vTi 8lbGQ0Q+3rvhRadW+fDghIuy2NGJaCGU5U2Ls0D8CD5WgDIlxEXq3Eqb3CO4XRpzrUKB j6Gpb+spQ/IOuN58sS57hhVuRIAH4iua4Xu9nkWwMezK9Sugw544+lPbkJnO+JnSa+g9 GB7SkCRxveb4Js77TQhJmvzYNLrkHXRuGNni0KnEZ+5BmbufEyPjTSBl3dpDZNJOmIC9 Nifg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=syM+mD+FEQQ9t/H4a+6C6wVoDM4rV6ydwN4nhDRJ5r8=; b=nV3IZuJBtHugIqGUgJCTEOO2R3cc8gntGXoVSJ9ppk5O3EPlKL4BDMp7ZwwUUfDMQO 3gS0B33Fd8CDOxeIGlRNCKZG8MGjk0aLuFG7Zno/QzuoZ1TEm8E7MoCzBK4wd9xmCAH9 NasXp3o7TqusEiitv5ovZFQxz4+gwq6bB0ADTiVwj4wEzaVQ4StiwE2/65CfARFCpg/S /AkZuluhMy+zQpQGt+AUJMnK+SBCOq0CRr+73PVxLzs7vwsN7++GzRja/nyGSwc4DpxI PtS3m3+I8Iz6cdSTGV2zXSHtZ3vGJn0QLl6nUkKqSFBmaSyParzYqo6fCNa/23H/+jH6 kMkA== X-Gm-Message-State: APjAAAVXU55AYNKRdfb8Mj9b9s8jPiGzRB6TvHj9avqTGSuBoodpj4DE o1lzgvpXIAML11l2fZKK3rBdsw== X-Google-Smtp-Source: APXvYqxWI/DBEwPuCP/Kk1TM+CIIF4ErZ8ITndynh6kFMO69cOTMEAOzHw9u33oZUyT7IoMLbdGh+w== X-Received: by 2002:a63:fc1c:: with SMTP id j28mr5094787pgi.289.1582902380700; Fri, 28 Feb 2020 07:06:20 -0800 (PST) Received: from nb01257.pb.local ([240e:82:3:5b12:940:b7e:a31d:58eb]) by smtp.gmail.com with ESMTPSA id y1sm7621912pgs.74.2020.02.28.07.06.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 07:06:19 -0800 (PST) From: Guoqing Jiang To: axboe@kernel.dk Cc: linux-block@vger.kernel.org, Guoqing Jiang Subject: [PATCH 3/6] block: remove redundant setting of QUEUE_FLAG_DYING Date: Fri, 28 Feb 2020 16:05:15 +0100 Message-Id: <20200228150518.10496-4-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200228150518.10496-1-guoqing.jiang@cloud.ionos.com> References: <20200228150518.10496-1-guoqing.jiang@cloud.ionos.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Previously, blk_cleanup_queue has called blk_set_queue_dying to set the flag, no need to do it again. Signed-off-by: Guoqing Jiang Reviewed-by: Nikolay Borisov Reviewed-by: Bart Van Assche Reviewed-by: Chaitanya Kulkarni --- block/blk-core.c | 1 - 1 file changed, 1 deletion(-) diff --git a/block/blk-core.c b/block/blk-core.c index 6d36c2ad40ba..883ffda216e4 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -346,7 +346,6 @@ void blk_cleanup_queue(struct request_queue *q) blk_queue_flag_set(QUEUE_FLAG_NOMERGES, q); blk_queue_flag_set(QUEUE_FLAG_NOXMERGES, q); - blk_queue_flag_set(QUEUE_FLAG_DYING, q); /* * Drain all requests queued before DYING marking. Set DEAD flag to From patchwork Fri Feb 28 15:05:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 11412443 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 08B4513A4 for ; Fri, 28 Feb 2020 15:06:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D59DE2469D for ; Fri, 28 Feb 2020 15:06:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="G/2YveMe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726980AbgB1PGc (ORCPT ); Fri, 28 Feb 2020 10:06:32 -0500 Received: from mail-pj1-f67.google.com ([209.85.216.67]:33162 "EHLO mail-pj1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726805AbgB1PGc (ORCPT ); Fri, 28 Feb 2020 10:06:32 -0500 Received: by mail-pj1-f67.google.com with SMTP id m7so4433717pjs.0 for ; Fri, 28 Feb 2020 07:06:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.ionos.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MmlSCV1UkvLr/iJG9NF31H7Jmp9fYYp/6LpJItDDNzo=; b=G/2YveMeeNIYVrifhL98VUWjo0T0QUYZpiIw88hm6zUyazo3iWoCAWsZhMKNyrOupl NeT3l8EEd42B5WZlTtJkMAFjykva+0nd1nvP7vyw5+p2s4TSCcN30Bekiy1ZUbBkthoC nf8VR+nddLuWqniiEvgDI0id6NoJ8iNqEZzo4V9awF9k2VcpYhKdUFXjt1wNUbfIDGu7 /stSIm99kO6n2FK5jUCewbuTJG7OiUowmUelBjfQSwpdrKFcfvPixLgAyrmaIbWiSye9 jLkOFI/EHAJ5bvNlpa21igx2Zix9G6iq8Qb3P01gBeimfbyOfI9jok+QAZfdEWWm6CWb YO/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MmlSCV1UkvLr/iJG9NF31H7Jmp9fYYp/6LpJItDDNzo=; b=qgH2FRRzX/iJRZyjHGZrKyqKIxoyF8pZziaDCGBZOxwv6xzSeQbuhsX/TOmzYzNhXK RudK6AqfgN5idQqKr0Nn5UdFHv/Q8i9YEe1q+5RR6K9EFQohsCuTT6AEKlXet2s1KcLY 7nQcPsf0nnvatxX6wdSKZjwk80gzkBSfwMsLfq/b7JPtWZdaFOJqRbMC+xYiKaSjhNTw Khciv546SzlJVf2f45KRgtaquVOj48oTRg4MHiGFD5JviH7X5ikfX4/bQdVoIxYtjYPk xdQtzX3UFza52Wa/8DfEl3GjuQwlOJdpdF8thT4KHs1odwJJOtXhru5OI1qCezLoURQK WIuQ== X-Gm-Message-State: APjAAAW2flSQ5FX2hBinu20BAmgDMmgnnjYmVZ7KaiLuzq7lcNdwWmeU AyHT3Q+m52rYG79ptWslaHmO2Id2j0UOduw/ X-Google-Smtp-Source: APXvYqy9/KPGc6eJMAXdReYIBmf2iKB1/d1KR9yMbHYmemLYJ2TEFyMOjLlvI6BLbvt8DK2S9tL2sQ== X-Received: by 2002:a17:902:9f86:: with SMTP id g6mr4110588plq.299.1582902389597; Fri, 28 Feb 2020 07:06:29 -0800 (PST) Received: from nb01257.pb.local ([240e:82:3:5b12:940:b7e:a31d:58eb]) by smtp.gmail.com with ESMTPSA id y1sm7621912pgs.74.2020.02.28.07.06.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 07:06:28 -0800 (PST) From: Guoqing Jiang To: axboe@kernel.dk Cc: linux-block@vger.kernel.org, Guoqing Jiang Subject: [PATCH 4/6] block: remove obsolete comments for _blk/blk_rq_prep_clone Date: Fri, 28 Feb 2020 16:05:16 +0100 Message-Id: <20200228150518.10496-5-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200228150518.10496-1-guoqing.jiang@cloud.ionos.com> References: <20200228150518.10496-1-guoqing.jiang@cloud.ionos.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Both cmd and sense had been moved to scsi_request, so remove the related comments to avoid confusion. Signed-off-by: Guoqing Jiang --- block/blk-core.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 883ffda216e4..9094fd7d1b01 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1583,7 +1583,6 @@ EXPORT_SYMBOL_GPL(blk_rq_unprep_clone); /* * Copy attributes of the original request to the clone request. - * The actual data parts (e.g. ->cmd, ->sense) are not copied. */ static void __blk_rq_prep_clone(struct request *dst, struct request *src) { @@ -1610,8 +1609,6 @@ static void __blk_rq_prep_clone(struct request *dst, struct request *src) * * Description: * Clones bios in @rq_src to @rq, and copies attributes of @rq_src to @rq. - * The actual data parts of @rq_src (e.g. ->cmd, ->sense) - * are not copied, and copying such parts is the caller's responsibility. * Also, pages which the original bios are pointing to are not copied * and the cloned bios just point same pages. * So cloned bios must be completed before original bios, which means From patchwork Fri Feb 28 15:05:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 11412445 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7FC78138D for ; Fri, 28 Feb 2020 15:06:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5F3B42469F for ; Fri, 28 Feb 2020 15:06:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="WgFsVSiO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726994AbgB1PGm (ORCPT ); Fri, 28 Feb 2020 10:06:42 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:38567 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726805AbgB1PGl (ORCPT ); Fri, 28 Feb 2020 10:06:41 -0500 Received: by mail-pg1-f193.google.com with SMTP id d6so1664826pgn.5 for ; Fri, 28 Feb 2020 07:06:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.ionos.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=w5IWlWsaAR3Ywj3NVn3Owh6HRx1odbyjzEUx8w5C8jk=; b=WgFsVSiOn1cfhW5Tc1VccnSdnElD1w0HOQOEn8tnTyAYaWNNO8nZfLlcYmb5wfFL67 /hslUNhjypH+3GOPN1KMkEW6XDC4xHIFz6fpVb9qB7Zb+3k3HffT5Duql8eYSg9Avbcl ewLdLt7eHlWA7svqi0zj8FYLfzXHLwVNczLBmGh4IPtdlWZAO7ilapIWt5S7RkmAt7jb nRwLdmMHvD5wk/BAlsEwP+CW/gPr0kjBTuetyhm3LL3AEN+GVAZe6UXMcdJjJG/cGBpQ QIqnwjCiKWp/x4NP/h3V38lh1Tqr29EZsZirjq1bTXS0eS9sw5dY+KZKn8xWmmHgNaDu FhsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=w5IWlWsaAR3Ywj3NVn3Owh6HRx1odbyjzEUx8w5C8jk=; b=bsFtb3TKYxPnMD21t+pjgRyvOQOH5DhPGMAo6cFt7b5Bf7BFuPVw1uFvd22Ri0jh7i b03EU8XpWmpX0QQVDJbqC68r+sKhcfXgjX548ytZJDtafh8ehTH58MQsZ5IR6l63nPyG eeFWeIi7lTzfx037IqPLoMvqqNteLSCWiPDiWZHwt6fuwRqe3XVKUf4CqAhXpVcOCzqN rhBdHEZfnr8vZpdOll8KyA79xwOJUsrG7yotgaQf1ujglp3lQrM89aaLA2s27iFHB4+F lU8M3jdnrL0Mm4a2m23BeaVESZtseEX0P+EDwRhw5cB+AUN1/teMrPEpfcJh9Qz27EY+ 247g== X-Gm-Message-State: ANhLgQ1ZcVbB6WmqBxtn/ateL8S8htPpnceKHQ6eu+AgiJFPBDvnMyLn EGu/ETG3x1VLSN+EUUoF2+GVxA== X-Google-Smtp-Source: ADFU+vvgO/f+UYZ/u/pwALH/orOxJ4/aVU36a/Y2CxXl0D6TI4yvFRvIY+iyxIRbqwReK2W0BU3Ipw== X-Received: by 2002:a63:36ce:: with SMTP id d197mr770162pga.8.1582902399317; Fri, 28 Feb 2020 07:06:39 -0800 (PST) Received: from nb01257.pb.local ([240e:82:3:5b12:940:b7e:a31d:58eb]) by smtp.gmail.com with ESMTPSA id y1sm7621912pgs.74.2020.02.28.07.06.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 07:06:38 -0800 (PST) From: Guoqing Jiang To: axboe@kernel.dk Cc: linux-block@vger.kernel.org, Guoqing Jiang Subject: [PATCH 5/6] block: remove unneeded argument from blk_alloc_flush_queue Date: Fri, 28 Feb 2020 16:05:17 +0100 Message-Id: <20200228150518.10496-6-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200228150518.10496-1-guoqing.jiang@cloud.ionos.com> References: <20200228150518.10496-1-guoqing.jiang@cloud.ionos.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Remove 'q' from arguments since it is not used anymore after commit 7e992f847a08e ("block: remove non mq parts from the flush code"). Signed-off-by: Guoqing Jiang Reviewed-by: Nikolay Borisov Reviewed-by: Bart Van Assche Reviewed-by: Chaitanya Kulkarni --- block/blk-flush.c | 4 ++-- block/blk-mq.c | 3 +-- block/blk.h | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/block/blk-flush.c b/block/blk-flush.c index 3f977c517960..963ae56d5aae 100644 --- a/block/blk-flush.c +++ b/block/blk-flush.c @@ -485,8 +485,8 @@ int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask, } EXPORT_SYMBOL(blkdev_issue_flush); -struct blk_flush_queue *blk_alloc_flush_queue(struct request_queue *q, - int node, int cmd_size, gfp_t flags) +struct blk_flush_queue *blk_alloc_flush_queue(int node, int cmd_size, + gfp_t flags) { struct blk_flush_queue *fq; int rq_sz = sizeof(struct request); diff --git a/block/blk-mq.c b/block/blk-mq.c index a12b1763508d..9684ea9a9e1f 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2405,8 +2405,7 @@ blk_mq_alloc_hctx(struct request_queue *q, struct blk_mq_tag_set *set, init_waitqueue_func_entry(&hctx->dispatch_wait, blk_mq_dispatch_wake); INIT_LIST_HEAD(&hctx->dispatch_wait.entry); - hctx->fq = blk_alloc_flush_queue(q, hctx->numa_node, set->cmd_size, - gfp); + hctx->fq = blk_alloc_flush_queue(hctx->numa_node, set->cmd_size, gfp); if (!hctx->fq) goto free_bitmap; diff --git a/block/blk.h b/block/blk.h index 0b8884353f6b..670337b7cfa0 100644 --- a/block/blk.h +++ b/block/blk.h @@ -55,8 +55,8 @@ is_flush_rq(struct request *req, struct blk_mq_hw_ctx *hctx) return hctx->fq->flush_rq == req; } -struct blk_flush_queue *blk_alloc_flush_queue(struct request_queue *q, - int node, int cmd_size, gfp_t flags); +struct blk_flush_queue *blk_alloc_flush_queue(int node, int cmd_size, + gfp_t flags); void blk_free_flush_queue(struct blk_flush_queue *q); void blk_freeze_queue(struct request_queue *q); From patchwork Fri Feb 28 15:05:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 11412447 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8DE5913A4 for ; Fri, 28 Feb 2020 15:06:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C20B24699 for ; Fri, 28 Feb 2020 15:06:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="Zhdt7xkg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727000AbgB1PGv (ORCPT ); Fri, 28 Feb 2020 10:06:51 -0500 Received: from mail-pj1-f66.google.com ([209.85.216.66]:53261 "EHLO mail-pj1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726805AbgB1PGv (ORCPT ); Fri, 28 Feb 2020 10:06:51 -0500 Received: by mail-pj1-f66.google.com with SMTP id i11so1345561pju.3 for ; Fri, 28 Feb 2020 07:06:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.ionos.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=voOQUMSUyp79AXPbhWgsmJqdQXnoM8mfKBxzIse2Eeg=; b=Zhdt7xkgJ9VZJueyLE++xHiOrxxZQ+G1QS4VkcKKyLRbgB1qxVtL0CY91rKDrZKeAH W2y7JT1wQczPoGFCePuFmYI/Wk7IhbjW9mRlBmvfTmg8sSRVGV78UALFwlEJZoSpNyux pfcEsMPPJxLuK2ZuXjHwNja6tqrs03dl+1kuw6AtFuJycwjAp/hrcyAOFAFQBhJiyILf cldamZX9Udjbm8w7iwMrOiFKXd23K+wvuMjgr8n+SEhhnbX/wTW2dgjbHyulgrKlx4aQ HAnhJj0ij+tp2WUpEUUZXBSUXHFqejeKr2Kellxza4PluS4g5+Srg82UuTZpTP3qX/Mn cgMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=voOQUMSUyp79AXPbhWgsmJqdQXnoM8mfKBxzIse2Eeg=; b=cxvQnvYVKmOCyJl4MG5O3iIDxpdNjKHT2I1l1byBLVQ4h/miEHAlYg44NFKEzTTm++ XcPGB0RRoLIfEFuFM9mNXjwUcBtoSAfLaFK2w3RrzVFrBb0x3psWuuXPYRrPO7+a9iwV qZCo6Q9yLT6ioyVFvCItGL9sDyomMzJIOyN9CqzqVe4eTZ4o/CjjkB6ogyhqCnHNw7qz i1m6C4um2gIEDvfRyT9md9W6atfrqSc1xzhl9lQ5IOLL6J6QDjfG8S2QVdv/u8qvdt3C xHRrnEONxDmPcXRHMhet5kVVKOjLBpn5lvoeF+0C7ZSKoJqeg/R4AVjRbqkL+WUWK4Cw MUUg== X-Gm-Message-State: APjAAAU76OSXOodIGjT/VHYyNwZ7hMrWbn4X6vr0m6CTOFQcpmM2ClcT Y5fXdhdHAMRcVVYOnacRE4Kfs559IVvJ64ua X-Google-Smtp-Source: APXvYqzHfpvAeoRSoHzcdFjuAJlpzhN0oMFqxLB6tBpfEaVxb7vCfstb6AsaMKol4mnXNzC75xs1wA== X-Received: by 2002:a17:902:7e05:: with SMTP id b5mr4362514plm.219.1582902408945; Fri, 28 Feb 2020 07:06:48 -0800 (PST) Received: from nb01257.pb.local ([240e:82:3:5b12:940:b7e:a31d:58eb]) by smtp.gmail.com with ESMTPSA id y1sm7621912pgs.74.2020.02.28.07.06.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 07:06:48 -0800 (PST) From: Guoqing Jiang To: axboe@kernel.dk Cc: linux-block@vger.kernel.org, Guoqing Jiang Subject: [PATCH 6/6] block: cleanup comment for blk_flush_complete_seq Date: Fri, 28 Feb 2020 16:05:18 +0100 Message-Id: <20200228150518.10496-7-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200228150518.10496-1-guoqing.jiang@cloud.ionos.com> References: <20200228150518.10496-1-guoqing.jiang@cloud.ionos.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Remove the comment about return value, since it is not valid after commit 404b8f5a03d84 ("block: cleanup kick/queued handling"). Signed-off-by: Guoqing Jiang Reviewed-by: Nikolay Borisov Reviewed-by: Bart Van Assche Reviewed-by: Chaitanya Kulkarni --- block/blk-flush.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/block/blk-flush.c b/block/blk-flush.c index 963ae56d5aae..46fd6e83dd79 100644 --- a/block/blk-flush.c +++ b/block/blk-flush.c @@ -160,9 +160,6 @@ static void blk_account_io_flush(struct request *rq) * * CONTEXT: * spin_lock_irq(fq->mq_flush_lock) - * - * RETURNS: - * %true if requests were added to the dispatch queue, %false otherwise. */ static void blk_flush_complete_seq(struct request *rq, struct blk_flush_queue *fq,