From patchwork Wed Oct 4 13:55:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Goldwyn Rodrigues X-Patchwork-Id: 9984779 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ED27360237 for ; Wed, 4 Oct 2017 13:55:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E22A628633 for ; Wed, 4 Oct 2017 13:55:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D718028770; Wed, 4 Oct 2017 13:55:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D16328633 for ; Wed, 4 Oct 2017 13:55:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752275AbdJDNzd (ORCPT ); Wed, 4 Oct 2017 09:55:33 -0400 Received: from mx2.suse.de ([195.135.220.15]:33913 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752267AbdJDNzd (ORCPT ); Wed, 4 Oct 2017 09:55:33 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 679B0ADE7; Wed, 4 Oct 2017 13:55:32 +0000 (UTC) From: Goldwyn Rodrigues To: linux-block@vger.kernel.org Cc: axboe@kernel.dk, shli@kernel.org, Goldwyn Rodrigues Subject: [PATCH 7/9] dm: Add nowait support to raid1 Date: Wed, 4 Oct 2017 08:55:09 -0500 Message-Id: <20171004135511.26110-8-rgoldwyn@suse.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171004135511.26110-1-rgoldwyn@suse.de> References: <20171004135511.26110-1-rgoldwyn@suse.de> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Goldwyn Rodrigues If the I/O would block because the devices are syncing, bail. Signed-off-by: Goldwyn Rodrigues --- drivers/md/dm-raid1.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c index c0b82136b2d1..96044b7787f9 100644 --- a/drivers/md/dm-raid1.c +++ b/drivers/md/dm-raid1.c @@ -1204,6 +1204,14 @@ static int mirror_map(struct dm_target *ti, struct bio *bio) if (rw == WRITE) { /* Save region for mirror_end_io() handler */ bio_record->write_region = dm_rh_bio_to_region(ms->rh, bio); + if (bio->bi_opf & REQ_NOWAIT) { + int state = dm_rh_get_state(ms->rh, + bio_record->write_region, 1); + if (state != DM_RH_CLEAN && state != DM_RH_DIRTY) { + bio_wouldblock_error(bio); + return DM_MAPIO_SUBMITTED; + } + } queue_bio(ms, bio, rw); return DM_MAPIO_SUBMITTED; } @@ -1219,6 +1227,11 @@ static int mirror_map(struct dm_target *ti, struct bio *bio) if (bio->bi_opf & REQ_RAHEAD) return DM_MAPIO_KILL; + if (bio->bi_opf & REQ_NOWAIT) { + bio_wouldblock_error(bio); + return DM_MAPIO_SUBMITTED; + } + queue_bio(ms, bio, rw); return DM_MAPIO_SUBMITTED; }