summaryrefslogtreecommitdiffstats
path: root/utils/nfsd/nfsd.c
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2010-09-16 14:34:39 -0400
committerSteve Dickson <steved@redhat.com>2010-09-16 14:34:39 -0400
commit72ae199db4be7bf0092e15adaa8a43ce2434bf9f (patch)
treedc72b8523205effb8fbb4b3ad5d965d5a615f502 /utils/nfsd/nfsd.c
parent63afb96b9d36e72782ad25ca496896029a9d9061 (diff)
downloadnfs-utils-72ae199db4be7bf0092e15adaa8a43ce2434bf9f.tar.gz
nfs-utils-72ae199db4be7bf0092e15adaa8a43ce2434bf9f.tar.xz
nfs-utils-72ae199db4be7bf0092e15adaa8a43ce2434bf9f.zip
rpc.nfsd: mount up nfsdfs is it doesn't appear to be mounted yet
There's a bit of a chicken and egg problem when nfsd is run the first time. On Fedora/RHEL at least, /proc/fs/nfsd is mounted up whenever nfsd is plugged in via a modprobe.conf "install" directive. If someone runs rpc.nfsd without plugging in nfsd.ko first, /proc/fs/nfsd won't be mounted and rpc.nfsd will end up using the legacy nfsctl interface. After that, nfsd will be plugged in and subsequent rpc.nfsd invocations will use that instead. This is a problem as some nfsd command-line options are ignored when the legacy interface is used. It'll also be a problem for people who want IPv6 enabled servers. The upshot is that we really don't want to use the legacy interface unless there is no other option. To avoid this situation, have rpc.nfsd check to see if the "threads" file is already present. If it's not, then make an attempt to mount /proc/fs/nfsd. This is a "best-effort" sort of thing, however so we just ignore the return code from the mount attempt and fall back to using nfsctl() if it fails. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'utils/nfsd/nfsd.c')
-rw-r--r--utils/nfsd/nfsd.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c
index 1cda1e5..658b8fa 100644
--- a/utils/nfsd/nfsd.c
+++ b/utils/nfsd/nfsd.c
@@ -246,6 +246,9 @@ main(int argc, char **argv)
exit(1);
}
+ /* make sure nfsdfs is mounted if it's available */
+ nfssvc_mount_nfsdfs(progname);
+
/* can only change number of threads if nfsd is already up */
if (nfssvc_inuse()) {
socket_up = 1;