Received: by 10.223.185.116 with SMTP id b49csp1071173wrg; Fri, 23 Feb 2018 11:23:28 -0800 (PST) X-Google-Smtp-Source: AH8x227FPIug5TSDTAgcROZDdKH/+d+32SDskT1uPX45uMJs7CQY6x2fou7NaLZCgZ0a1lt/YVvH X-Received: by 10.99.134.65 with SMTP id x62mr2146670pgd.291.1519413808506; Fri, 23 Feb 2018 11:23:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519413808; cv=none; d=google.com; s=arc-20160816; b=yRuaQc0Xvs80yqRejpk/AhJABhISjw5Wm5x1izbD5gfNMoABOCgImRx+zSqWSYx+21 rCcz1pJdc8VklxOQDzckQFAw8cFbIl414MnJbkcgTF5/lW9RNZ9uSrdEV9nz/1L1gTFc JzUshoMfC7OsS5Ij+wNKRqtE4uEwp/kw6pCIUiYCV0WsxE6VPFgnj3hwoEHDAEtJH7Om eKf/NGpk9bR913XDxsu9QZmLUbqep0H2zbqndb6Z4LtQVxpmwxMTbjftlf+aRmtpBvGR MFWPXBqcr4yB+uhcshEFMNKPb99DUeveUBDj9lwPRyGiVr31442Erigo2JrbTbY7pBJo JsFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=nIouyHIv9NJ02d+tZkZSkkTlrB6x+yIZUfPyfphZGYw=; b=P3wZ+DQxQ+8qj0pHZ0XZ/GFtPcbyqlV5rdvN2/fXEVsrp61o6ImiDS8AqydLrqR3WN kWcZgo8/cXOi5GDb995zYW9y/9RjYe6d5mvwF4wpwjLgx93u6uQhnKgEvjJ3u+m1UZMV FPHTnbrsxQX0yhx5dhGZvpRZxTMTMCOl85ZN1E1iIl2fVN2QAGiFzkN0gHZUmYuA/jYf KNJt0NPqoXb3GyRu1ImhI/RCamRUm2LcWIdyba/uMXSvqHiSHLu90ZcqrngIQ3zhgaO1 EtT3eEs5eu32G1h16tVq1i1SWzuLV7cB9RK8avlpe0BedAyeI3g4j+s52aiIyeDGaMND uEHA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h12si1859955pgn.439.2018.02.23.11.23.14; Fri, 23 Feb 2018 11:23:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754623AbeBWTWP (ORCPT + 99 others); Fri, 23 Feb 2018 14:22:15 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:47474 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935428AbeBWSxo (ORCPT ); Fri, 23 Feb 2018 13:53:44 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 572801055; Fri, 23 Feb 2018 18:53:43 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shaohua Li , Sasha Levin Subject: [PATCH 4.14 098/159] md/raid1/10: add missed blk plug Date: Fri, 23 Feb 2018 19:26:46 +0100 Message-Id: <20180223170755.356409151@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Shaohua Li [ Upstream commit 18022a1bd3709b74ca31ef0b28fccd52bcd6c504 ] flush_pending_writes isn't always called with block plug, so add it, and plug works in nested way. Signed-off-by: Shaohua Li Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/md/raid1.c | 4 ++++ drivers/md/raid10.c | 4 ++++ 2 files changed, 8 insertions(+) --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -810,11 +810,15 @@ static void flush_pending_writes(struct spin_lock_irq(&conf->device_lock); if (conf->pending_bio_list.head) { + struct blk_plug plug; struct bio *bio; + bio = bio_list_get(&conf->pending_bio_list); conf->pending_count = 0; spin_unlock_irq(&conf->device_lock); + blk_start_plug(&plug); flush_bio_list(conf, bio); + blk_finish_plug(&plug); } else spin_unlock_irq(&conf->device_lock); } --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -890,10 +890,13 @@ static void flush_pending_writes(struct spin_lock_irq(&conf->device_lock); if (conf->pending_bio_list.head) { + struct blk_plug plug; struct bio *bio; + bio = bio_list_get(&conf->pending_bio_list); conf->pending_count = 0; spin_unlock_irq(&conf->device_lock); + blk_start_plug(&plug); /* flush any pending bitmap writes to disk * before proceeding w/ I/O */ bitmap_unplug(conf->mddev->bitmap); @@ -914,6 +917,7 @@ static void flush_pending_writes(struct generic_make_request(bio); bio = next; } + blk_finish_plug(&plug); } else spin_unlock_irq(&conf->device_lock); }