From patchwork Tue Nov 17 11:52:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 7636581 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A9D6E9F1D3 for ; Tue, 17 Nov 2015 11:55:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DFAC3204EC for ; Tue, 17 Nov 2015 11:55:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 164C5204FC for ; Tue, 17 Nov 2015 11:55:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753530AbbKQLyp (ORCPT ); Tue, 17 Nov 2015 06:54:45 -0500 Received: from mail-qg0-f46.google.com ([209.85.192.46]:33226 "EHLO mail-qg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753512AbbKQLxn (ORCPT ); Tue, 17 Nov 2015 06:53:43 -0500 Received: by qgea14 with SMTP id a14so3419777qge.0 for ; Tue, 17 Nov 2015 03:53:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poochiereds_net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=n38sVRnKGIeSpNx16oE4Evi8AcpTWWcff0BtBzS8P3c=; b=r19kuNDgX16rSJTx5nrBf3ji/D9zVZFFprctvgci6Z3KvPClYnkJgXdNyMQ3b+v+5A SUsWUCeEiwYlf9oLmYSWbkJbA0ue97jNFoxp5Cus/N6Jlv27hCxAHhZbLoXjo6KT86ry 5IULQDHCO5d2LArKs8M1oU8gPJnwIy3msiCz7AG1y+FopVLv6ZmK9K9d2Kf4yFah3PUT Ss+PMABWVN1esnftJqc3j8iDpTpOaEn3gsjj7ricjf3Mwt4vN8iuyloP0ELGum7MmOpJ GlKEloyzXjS0emhIIIFHbvsWVxGa9S9jr63P7zbtZVPaii9UHSfYvDtYdZbo4O3q+8WG upKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=n38sVRnKGIeSpNx16oE4Evi8AcpTWWcff0BtBzS8P3c=; b=doDhjnQ2cntdhQtlZJ24b/pm/HloKo1b8B6wb7g1z7Po/TEXA7O2QkzDqBgq4BJJSV Kp1N+mt+2F+8hI2GTv01jgh59iVvOlKAEzgGKo4mPoQ9NujPaYJgvNLwvNVu7zAHRi5G d433ijiyZmdL3gXkf5S1PPoOogiOG7j65SnhsJIhL+ik7kPTMA0xMQt1VQo7e8Ppg6ds QQabEZURI3mIEgyaKi9RvjWT+E7G++Xtd8gJZCTXFT5lW75aqEtl8OVpq1cn2YsaGAWg o8alda1qh+MIF8B6NH1YpWtAbK5bP2VQm7Buah2pued+UIXvYoy1u15xIl0WbVvLVIS0 sOsA== X-Gm-Message-State: ALoCoQkDr+V3WempqTf24m9IAenGtdyT9UoA/hu8+R2N02Lo9lOa2QnH+XNUpw1f7DZjOLALt4zq X-Received: by 10.140.36.212 with SMTP id p78mr40451509qgp.13.1447761222610; Tue, 17 Nov 2015 03:53:42 -0800 (PST) Received: from tlielax.poochiereds.net ([2606:a000:1125:4075::d5a]) by smtp.googlemail.com with ESMTPSA id w10sm1583910qhc.16.2015.11.17.03.53.41 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Nov 2015 03:53:42 -0800 (PST) From: Jeff Layton X-Google-Original-From: Jeff Layton To: bfields@fieldses.org, trond.myklebust@primarydata.com Cc: linux-nfs@vger.kernel.org, Eric Paris , Alexander Viro , linux-fsdevel@vger.kernel.org Subject: [PATCH v1 24/38] nfsd: allow lockd to be forcibly disabled Date: Tue, 17 Nov 2015 06:52:46 -0500 Message-Id: <1447761180-4250-25-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1447761180-4250-1-git-send-email-jeff.layton@primarydata.com> References: <1447761180-4250-1-git-send-email-jeff.layton@primarydata.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In some cases, we may want to use a userland NLM server which will require that we turn off lockd. Signed-off-by: Jeff Layton --- fs/nfsd/nfssvc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index d1034d119afb..e266a41bed9b 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -241,8 +241,19 @@ static void nfsd_shutdown_generic(void) nfsd_file_cache_shutdown(); } +/* + * Allow admin to disable lockd. This would typically be used to allow (e.g.) + * a userspace NLM server of some sort to be used. + */ +static bool nfsd_disable_lockd = false; +module_param(nfsd_disable_lockd, bool, 0644); +MODULE_PARM_DESC(nfsd_disable_lockd, "Allow lockd to be manually disabled."); + static bool nfsd_needs_lockd(void) { + if (nfsd_disable_lockd) + return false; + #if defined(CONFIG_NFSD_V3) return (nfsd_versions[2] != NULL) || (nfsd_versions[3] != NULL); #else