Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp816008rwb; Mon, 26 Sep 2022 06:17:02 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6ZkieSc4NBEFhq4yrUod63Eya+SVpSCUtgLYvl7WxtA8WU99roRtj47K6w/vvhOc28egt8 X-Received: by 2002:a17:906:fc6:b0:72f:d080:416 with SMTP id c6-20020a1709060fc600b0072fd0800416mr18858566ejk.1.1664198222625; Mon, 26 Sep 2022 06:17:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664198222; cv=none; d=google.com; s=arc-20160816; b=eDKJXW/MCSMIS5mRo7L9I3q3WYypSBGEOJxRT7C2BzySWBJ/oLddaLcoc09S/G3d5h B1BJ181JZWNm2o1ZYF02yZMjlKR3q2BVcy9dJBIMGr/cRXlITRfNUgIJxMdfM0yb6INg 543luozaXteYGTUsHLr24o4mK2VfJ7maTyNtHr9mWckGIu07QZVe/EH3/qOfn1B2I1fk +FVJEnC6ISeKopaRRFg3/Kq3bEoYWe/Gd7XeqOH5iXnniaYNhtj2PWSrMznsgzaBImiG xSX0ydaawHfJqsIW98b3C8qvVUtiZMuQnBhx2aVcCOnpwHoses4QmKlChRMQtTPKWhRI EvLg== 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=8Mj4DgoWUGL73CUMWGkHte7d8dpBKo/ukr7CjVaH1AA=; b=omTJYXVCF8iDV4BuLUIPKN/h/XvlPba6NMqJufRD+Smz0gi/vgJ8NvyOFNteh7h2Nj Q/IKJWXNq/pkIGcxR0RBOi9eCSD/SWP1ZPMzwivcFbRj75qRBue/FjfcMRpnCkdvK7kz OZZqsDDZvmhkfYrh0fg32/o5JBPsvQj0CWOP8AEAwU+QrsYRzlZbN0J9LIyIggdg+5M9 CokQUB/874QoxI2XTXM6VPP7HiRETuCW8RG4kGpDHozAgrsh6u6qhNS0zoaC8KkGdAJe 83RSbt68k1BDy/6XrKCYQQs465OBRt7WgrTM7/5nb5jta3Zt95HJfNwGYCzjPQaff7KS rBcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UBTowmvb; 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 sc3-20020a1709078a0300b00781599eb7e4si580071ejc.753.2022.09.26.06.16.37; Mon, 26 Sep 2022 06:17:02 -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=UBTowmvb; 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 S234850AbiIZL1q (ORCPT + 99 others); Mon, 26 Sep 2022 07:27:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237940AbiIZL0v (ORCPT ); Mon, 26 Sep 2022 07:26:51 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BEBC6A489; Mon, 26 Sep 2022 03:41:00 -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 D8808B80688; Mon, 26 Sep 2022 10:40:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2DBD8C433D6; Mon, 26 Sep 2022 10:40:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1664188850; bh=3qMiBviQLJD7UsBBT4SvQ9/507KRJ/0h50pF7lkKJlA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UBTowmvbx667AbIZDceFdPeEstaUW7k9IebI4PFLGvqnnk9el75jrPT9rAVDsajwf IHd9LBpxqLCzY/E71AAr3Wf9ZPywihm4RHIbHrDGIsK9tj+zQgdktS3LtL1zkcZfzY kXOVgRyorVccznvRHG2d87F76gH9vF6bxmSc9soE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, David Wysochanski , Trond Myklebust , Thorsten Leemhuis Subject: [PATCH 5.15 141/148] NFSv4: Fixes for nfs4_inode_return_delegation() Date: Mon, 26 Sep 2022 12:12:55 +0200 Message-Id: <20220926100801.499600091@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926100756.074519146@linuxfoundation.org> References: <20220926100756.074519146@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.2 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 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: Trond Myklebust commit 6e176d47160cec8bcaa28d9aa06926d72d54237c upstream. We mustn't call nfs_wb_all() on anything other than a regular file. Furthermore, we can exit early when we don't hold a delegation. Reported-by: David Wysochanski Signed-off-by: Trond Myklebust Cc: Thorsten Leemhuis Signed-off-by: Greg Kroah-Hartman --- fs/nfs/delegation.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -755,11 +755,13 @@ int nfs4_inode_return_delegation(struct struct nfs_delegation *delegation; delegation = nfs_start_delegation_return(nfsi); - /* Synchronous recall of any application leases */ - break_lease(inode, O_WRONLY | O_RDWR); - nfs_wb_all(inode); - if (delegation != NULL) + if (delegation != NULL) { + /* Synchronous recall of any application leases */ + break_lease(inode, O_WRONLY | O_RDWR); + if (S_ISREG(inode->i_mode)) + nfs_wb_all(inode); return nfs_end_delegation_return(inode, delegation, 1); + } return 0; }