From patchwork Tue Mar 3 17:42:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 229952 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60901C3F2D7 for ; Tue, 3 Mar 2020 18:04:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 322D220836 for ; Tue, 3 Mar 2020 18:04:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258683; bh=99EtiNtJdAvPT2as60AJ2VmPObSheEPp0q5rtgVAgns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gH70iqPNUl5LTnEJNtQiLmDOAsiCEM6cdBBiVAEozdI+lKkFL82k1wgHGOzT6MGMK jNISzcVKh5jQAV15pr7eI7BcWOP7Z0uLhWeK5sPdv0bA216PqIHWMd0e348W9bv7tV IAVUtNn5pnwnt/nkNIpg3y+bW9xPeG6dj5gx4ghs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732663AbgCCSEj (ORCPT ); Tue, 3 Mar 2020 13:04:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:43124 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733015AbgCCR7n (ORCPT ); Tue, 3 Mar 2020 12:59:43 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5D69F20870; Tue, 3 Mar 2020 17:59:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258382; bh=99EtiNtJdAvPT2as60AJ2VmPObSheEPp0q5rtgVAgns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U7ght9guWA5K/checuZ4CWV4nG6nPDL0gdtV3M4JJJXJckkq2xc9UZgF4B8tTCjoJ YEw9HO8esXApwrVriTRzh4mzfzm0uLa/kH5pBX4wtG4cHOlq8TMEaboia1OcjtP0QK tBXKW9pRFP70ziMy3AMrxWX33lq8LLOx/5YvgJtc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jeff Moyer , Christoph Hellwig , Jan Kara , Dan Williams , Sasha Levin Subject: [PATCH 4.19 06/87] dax: pass NOWAIT flag to iomap_apply Date: Tue, 3 Mar 2020 18:42:57 +0100 Message-Id: <20200303174349.560203639@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174349.075101355@linuxfoundation.org> References: <20200303174349.075101355@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jeff Moyer [ Upstream commit 96222d53842dfe54869ec4e1b9d4856daf9105a2 ] fstests generic/471 reports a failure when run with MOUNT_OPTIONS="-o dax". The reason is that the initial pwrite to an empty file with the RWF_NOWAIT flag set does not return -EAGAIN. It turns out that dax_iomap_rw doesn't pass that flag through to iomap_apply. With this patch applied, generic/471 passes for me. Signed-off-by: Jeff Moyer Reviewed-by: Christoph Hellwig Reviewed-by: Jan Kara Link: https://lore.kernel.org/r/x49r1z86e1d.fsf@segfault.boston.devel.redhat.com Signed-off-by: Dan Williams Signed-off-by: Sasha Levin --- fs/dax.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/dax.c b/fs/dax.c index f0d932fa39c20..d09701aa6f2f4 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -1301,6 +1301,9 @@ dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter, lockdep_assert_held(&inode->i_rwsem); } + if (iocb->ki_flags & IOCB_NOWAIT) + flags |= IOMAP_NOWAIT; + while (iov_iter_count(iter)) { ret = iomap_apply(inode, pos, iov_iter_count(iter), flags, ops, iter, dax_iomap_actor);