From patchwork Tue Oct 27 13:51:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 312136 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 7BA99C388F9 for ; Tue, 27 Oct 2020 17:06:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2B5FC20809 for ; Tue, 27 Oct 2020 17:06:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603818388; bh=3MF96z3/pPoGgH1L9zE3w8imvST2t6lftauu81oTr+g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pdUk2GbMXZ05sKvvSfd/Fakj9yRtOcmU1uK1hkR+l/TJNQc2DyvfwpAhBXO0BoMRk 5I8eXBmBYkSHAOxaNQ18+c5z3YtrIqFJHHiElejfwf8LnYhJwD7Uc/LsVC5DurVtJc 5wgcy1h/FhuX3UtS/E38RZ1tXQnsTesyi2naAGNA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1793583AbgJ0PHR (ORCPT ); Tue, 27 Oct 2020 11:07:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:39640 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1790953AbgJ0PFE (ORCPT ); Tue, 27 Oct 2020 11:05:04 -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 4B72E2071A; Tue, 27 Oct 2020 15:05:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603811104; bh=3MF96z3/pPoGgH1L9zE3w8imvST2t6lftauu81oTr+g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BE/sw9qVt32s8zwVf2lNHqzJQg7mrm8lKCu5/TXvPkFIMOuWoWsavOqOR0T7exzWZ VDetRSWrsSGkTAA9YnrAM7tHEmmKid088qKjcZFNn8Idj4s+E/s/CPqYzvE3HJbaz4 OfIJpR0UAfbzd5NfLxHUT+ZOiF7MA5xCpegOJn58= 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.8 347/633] nfs: add missing "posix" local_lock constant table definition Date: Tue, 27 Oct 2020 14:51:30 +0100 Message-Id: <20201027135538.960325128@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@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 ccc88be88d6ae..a30b4bcb95a2c 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 }, {} };