Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp360103pxx; Wed, 28 Oct 2020 06:41:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy6R4n+0Mr053M/KFVTnnMujblO2C9dZDHRkgquWw7w0IvYJXRJcAqZzc5Co9hpng5qYVcv X-Received: by 2002:a05:6402:1004:: with SMTP id c4mr7823747edu.149.1603892489475; Wed, 28 Oct 2020 06:41:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603892489; cv=none; d=google.com; s=arc-20160816; b=Qlo+8FzmcdTyU3U76cfuKeJZwpXro3r+likGC7RVD9MjjzwWgaPb9pdQE2COXGLlV9 FO8k4mF1FtYcBh9uZNXWyGcPjNNYsCFWX1FeNwb5w17pvs1sQSRFA23/Z4xj2hPeXH8n 5QJ/4dagyfsJdeaJZv9w9IxzGoof8Ltzz3j9Hi0UdnceppDrCY0XHVm2uKexTPmSHtZJ rGrAQ+hX/ag0E9Op6w6rtWTMueBejwqgNOZRxpKvCcxcHHYOuCuUOLbGRkgWfPbgTn7d q1Q464dDj4LEtkiWMxN7uid6CCNAcMReWucO31OM3Vbixh17Zz02xzghc9i824NY11kO QETg== 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=6GzTWqADKFCn1ZETT63FfNYnnw/awOtr7MOOgxizKYo=; b=fIqgAPKP1Gq73FuuTfN4fiZMdGXK8A53yoJ9CKq3hoEJ8BkVg7yyz284WQoas/U/Mo Ed6F+lP3e0p2vutyTGljO/cV8HWthR22e0hTkCIMdEPrDCUiOKc6VZzy9508RbdYpat4 B4g6jgInAMqT3rsPHeTpvCe/rsfSZfExePgPQrZJj4Z5B+O/fjHsS8VkW1TfQ9vBDOyQ P5CsIkmxTm/MfRmbvfTmU9iez0nOfW9PF0xF/Wxf9qLfBEh87ZJljjquRtP6o1spc58Y SMjVyFqweF73sOxEUobXXkrD01YEFlS00s5CcmMwB55eu69pA7nPPbTQH+YmVqPckBKq 84SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JnTD5pCO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p19si2741759edu.169.2020.10.28.06.41.05; Wed, 28 Oct 2020 06:41:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JnTD5pCO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1802845AbgJ0Pvp (ORCPT + 99 others); Tue, 27 Oct 2020 11:51:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:56826 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1801048AbgJ0Phl (ORCPT ); Tue, 27 Oct 2020 11:37:41 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 B4CE8204EF; Tue, 27 Oct 2020 15:37:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603813061; bh=vtHwlY2xSLgUvff/al/JiYErjwP+mXqmcWZ2v2CieXk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JnTD5pCOTu0xdbH9MqfkPhShE83OS8oNR7w1dXFuzETAMYTAlJiQtYWf3sGev5i8+ XiNdtn+uXTqbGiquNXhopOIuGXzldFvkiRA6NdvipFdIIquAsyl6QdW1XUrLZ3850K pILSdLdMaCyFhEALgnglplx0ZemmyZ/b1f0th2Hk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Scott Mayhew , Anna Schumaker , Sasha Levin Subject: [PATCH 5.9 425/757] nfs: add missing "posix" local_lock constant table definition Date: Tue, 27 Oct 2020 14:51:15 +0100 Message-Id: <20201027135510.499477270@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Scott Mayhew [ Upstream commit a2d24bcb97dc7b0be1cb891e60ae133bdf36c786 ] "mount -o local_lock=posix..." was broken by the mount API conversion due to the missing constant. Fixes: e38bb238ed8c ("NFS: Convert mount option parsing to use functionality from fs_parser.h") Signed-off-by: Scott Mayhew Signed-off-by: Anna Schumaker Signed-off-by: Sasha Levin --- fs/nfs/fs_context.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c index 524812984e2d4..009987e690207 100644 --- a/fs/nfs/fs_context.c +++ b/fs/nfs/fs_context.c @@ -94,6 +94,7 @@ enum { static const struct constant_table nfs_param_enums_local_lock[] = { { "all", Opt_local_lock_all }, { "flock", Opt_local_lock_flock }, + { "posix", Opt_local_lock_posix }, { "none", Opt_local_lock_none }, {} }; -- 2.25.1