Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1534443iob; Thu, 5 May 2022 03:33:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxWcMj8+LKV2FhKYp5NP5t3LTqV+pFstvDLnzycvzAGkCfyYrcPhtFdgw1TXh+jHpf7RvP3 X-Received: by 2002:a17:907:86a8:b0:6f0:1f97:d7da with SMTP id qa40-20020a17090786a800b006f01f97d7damr25287254ejc.663.1651746825003; Thu, 05 May 2022 03:33:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651746824; cv=none; d=google.com; s=arc-20160816; b=skT4+8d3DiTlTS//UR/vEY62XAwqvy0JYE5NsbQqKSfK75a+jg5n96K+sMEBb147eB d+yMt5VjJ2me6W14QEauRwTGSb3oZ6gYr9DFIJ0T/wx8brnlIp0McM6/xwR2+tRqIYBX cGmVbem1/Xt/XAX7Amy1tw7tGJE/ErxCIUeu2nXZAI1ru01TRaIzDdbXQHb2jyU4d5Dn Ucwt84c93lxoZuzhZVoOztH/1S0c6qWxttLCiKZp1ecWHZwR+JT7DpKVjM9yHh4/yqRY 1p17gW684za33GFCL75IUHdqXq4aywDwvMRY2imJkWprWcRTWJZe7Psa8rEAdWmE5V4n rmCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FLsYFAsKGFOwvo56eBeDmJHiXo/Ccoadmje7Wji8Mdg=; b=N2TUOHWD3/kSPT7H0rJ1+lKmCCqYeQ1JeieFoeG8UVG7VogBq6GY8B+LnLR0do1Tl6 d/HIGqlUk6ZH1sdhuciQX98FUMAaq+J3XGOMSe+Pn2Of9Ec6RYlMdN9WwNt/VATFe1rG kwRpgHv7sLivD/CUx/BM4jUGD8vBBzAlUNeRh2lCJcjy7kKO8GPnobV/ERUj8JN16OTL dcNWdgdMPWhWc0PtnjzyhOmySkOVeGGwP+U1RdR6cIfeY2ij33FKNUd3e4kspKms2aW5 jQV3/ibzRWBYxPEVto2gqcKULSfcaP8RowvfjW1AclVfBs+dC0Qd/lkhCp1rIJYzxvqd Qh4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=no9+2HVZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sa6-20020a1709076d0600b006dfc3945326si2379331ejc.152.2022.05.05.03.33.20; Thu, 05 May 2022 03:33:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=no9+2HVZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354293AbiEDRp5 (ORCPT + 99 others); Wed, 4 May 2022 13:45:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356388AbiEDRNl (ORCPT ); Wed, 4 May 2022 13:13:41 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 713E94BFF4; Wed, 4 May 2022 09:57:56 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 1585DB827B4; Wed, 4 May 2022 16:57:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B55A1C385A4; Wed, 4 May 2022 16:57:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683474; bh=WdSUIlFNvb+1GIbWLYslyQTqfXLiP1KfZajIkU8Io1E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=no9+2HVZiywN2cBBHTX4mP3GOVNhrVD+W9tFNRyNkwkC9Ck0+SeY62X2IGKBKGclu a2NNZ5X8Q/IE1O1jdzmyXfHd0iNpGcgzYpXIOKLiWFqIousta6otWpz3uCeelNxW26 rQUJQB0m/6A5p6mVQcevoULhqEr+VWuppXtM7HFU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andreas Gruenbacher , Sasha Levin Subject: [PATCH 5.17 149/225] gfs2: Make sure not to return short direct writes Date: Wed, 4 May 2022 18:46:27 +0200 Message-Id: <20220504153123.413413896@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andreas Gruenbacher [ Upstream commit 3bde4c48586074202044456285a97ccdf9048988 ] When direct writes fail with -ENOTBLK because we're writing into a hole (gfs2_iomap_begin()) or because of a page invalidation failure (iomap_dio_rw()), we're falling back to buffered writes. In that case, when we lose the inode glock in gfs2_file_buffered_write(), we want to re-acquire it instead of returning a short write. Signed-off-by: Andreas Gruenbacher Signed-off-by: Sasha Levin --- fs/gfs2/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index de0122806fb3..fdc7eda0437a 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c @@ -1069,7 +1069,7 @@ static ssize_t gfs2_file_buffered_write(struct kiocb *iocb, from->count = min(from->count, window_size - leftover); if (gfs2_holder_queued(gh)) goto retry_under_glock; - if (read) + if (read && !(iocb->ki_flags & IOCB_DIRECT)) goto out_uninit; goto retry; } -- 2.35.1