Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp3327574iob; Mon, 16 May 2022 19:32:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzxW9RFPR8g1PW536SEjZGMHkWAZGI92HVyCSTQU1SHCTspB79AMBv2dkh9pPtSHi1Rew2+ X-Received: by 2002:a05:6402:1941:b0:413:2822:9c8 with SMTP id f1-20020a056402194100b00413282209c8mr16656909edz.13.1652754744282; Mon, 16 May 2022 19:32:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652754744; cv=none; d=google.com; s=arc-20160816; b=xJykmpPl8CJcCArAgIepZaBq44j73AOTyNluHuqX7uvYHJuVMqvJaqocsNBSs4QG8b IxbAHqnrkzDuY5uI+ykq4ZsVeVgL7+iiq+RnlHriTZeFCBLiki2GG0Xy0PDZbARtFoiY obzshYSJq+aFYd8OfKUrKTr3yk0gj8nHKsEkj3VVlpdK7bQSnN+eWfbppHzLhdWS9nuc 8gftRmQTwQ6y0LgUCH1Nue66VxKtS3K30U2BpxnSX5PAdmhBqdJf4RTDAeFwmYWxc2G/ Z6FKWW1iabavU/cmuhEHjwYwklDdPTDYU8OPQ1ItxVHKqOiuFaK5CtfkKWg3dc1Bfvd5 TyKA== 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=BJsrVZZhtSg/ob+51Dr3CfuUbA/EszIB+3v6090d6/w=; b=bSgg8CNXVLWW+aVA/qmre6Gh6cwbvbihGZvMu70AAZOiNofTOZMS0BGTaVgeK9NvZc HkhDbOtHoig82LjU+WuvmkJxi4W5GLSki7JWbSjBgJQRWL+mu60vB7/ICEIfh0kpdPn8 x/6+q4gZIFN6x1qQHPS9O5YRSUGmcul+bL51CpTSCY22/t8m/dviUj4vVYwDo+jwA+rq WZsYODXe12DspepKs+noZBbgW5gX9wYNedLNTWrk98Rgmi+GNStxur+Rl2HXygNCw+Fj +zulvtWOFrI6z5QK7KqzPF8p/kt455mVXABwvLzpHq/5g+wa7Nh17Lgm2N4fov+T7ZS4 YchQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wHn7glZW; 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 mp38-20020a1709071b2600b006e7ec2be6bbsi1871286ejc.411.2022.05.16.19.31.58; Mon, 16 May 2022 19:32:24 -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=wHn7glZW; 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 S1351340AbiEPUDG (ORCPT + 99 others); Mon, 16 May 2022 16:03:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348724AbiEPTxD (ORCPT ); Mon, 16 May 2022 15:53:03 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9E6E46B2D; Mon, 16 May 2022 12:48:51 -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 A813EB81612; Mon, 16 May 2022 19:48:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E61FDC385AA; Mon, 16 May 2022 19:48:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1652730516; bh=rqfekv0jGsZubz8FtTJU1FPHkwUoFSHNJwCMoZw6RAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wHn7glZWpA5mJiH3Ru4g+HrYmEMFiIEnQEf/PLAEA5zwlTKd067Fh29+LYzKX74hi /3IzJs0OnEkk5vhbUpdd4WyLKa8jhHa4Y5RGz7ei1jNjUXK6AJkdTp5I/rcAgm9Bm2 F1nZl99TXGApV24LvRC+WTCCTgWBT6TIzm6o3v5I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Aloni , Trond Myklebust , Sasha Levin Subject: [PATCH 5.15 024/102] nfs: fix broken handling of the softreval mount option Date: Mon, 16 May 2022 21:35:58 +0200 Message-Id: <20220516193624.694643295@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220516193623.989270214@linuxfoundation.org> References: <20220516193623.989270214@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.4 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: Dan Aloni [ Upstream commit 085d16d5f949b64713d5e960d6c9bbf51bc1d511 ] Turns out that ever since this mount option was added, passing `softreval` in NFS mount options cancelled all other flags while not affecting the underlying flag `NFS_MOUNT_SOFTREVAL`. Fixes: c74dfe97c104 ("NFS: Add mount option 'softreval'") Signed-off-by: Dan Aloni Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/fs_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c index 0d444a90f513..fb3cad38b149 100644 --- a/fs/nfs/fs_context.c +++ b/fs/nfs/fs_context.c @@ -514,7 +514,7 @@ static int nfs_fs_context_parse_param(struct fs_context *fc, if (result.negated) ctx->flags &= ~NFS_MOUNT_SOFTREVAL; else - ctx->flags &= NFS_MOUNT_SOFTREVAL; + ctx->flags |= NFS_MOUNT_SOFTREVAL; break; case Opt_posix: if (result.negated) -- 2.35.1