summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/netns.h
diff options
context:
space:
mode:
authorKinglong Mee <kinglongmee@gmail.com>2013-12-31 06:17:30 +0100
committerJ. Bruce Fields <bfields@redhat.com>2014-01-04 00:18:50 +0100
commit8ef667140c52e9b88934664954217f28559c75d6 (patch)
tree73d4f73af96dad3d92af96a9086f3b354ab79799 /fs/nfsd/netns.h
parentSUNRPC/NFSD: Support a new option for ignoring the result of svc_register (diff)
downloadlinux-8ef667140c52e9b88934664954217f28559c75d6.tar.xz
linux-8ef667140c52e9b88934664954217f28559c75d6.zip
NFSD: Don't start lockd when only NFSv4 is running
When starting without nfsv2 and nfsv3, nfsd does not need to start lockd (and certainly doesn't need to fail because lockd failed to register with the portmapper). Reported-by: Gareth Williams <gareth@garethwilliams.me.uk> Reviewed-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Kinglong Mee <kinglongmee@gmail.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/netns.h')
-rw-r--r--fs/nfsd/netns.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h
index 849a7c3ced22..d32b3aa6600d 100644
--- a/fs/nfsd/netns.h
+++ b/fs/nfsd/netns.h
@@ -95,6 +95,7 @@ struct nfsd_net {
time_t nfsd4_grace;
bool nfsd_net_up;
+ bool lockd_up;
/*
* Time of server startup