diff options
author | rmacklem <rmacklem@FreeBSD.org> | 2011-04-25 22:22:51 +0000 |
---|---|---|
committer | rmacklem <rmacklem@FreeBSD.org> | 2011-04-25 22:22:51 +0000 |
commit | 8d09f5854972630dec5ac9a3362d13b2b014aed7 (patch) | |
tree | 215ddd2770caab91450f1ffc0936448f7790351a /sys/amd64 | |
parent | f8e844f47e956bc96fd494f89344c3dfc5b214e3 (diff) | |
download | FreeBSD-src-8d09f5854972630dec5ac9a3362d13b2b014aed7.zip FreeBSD-src-8d09f5854972630dec5ac9a3362d13b2b014aed7.tar.gz |
Fix the experimental NFS client so that it does not bogusly
set the f_flags field of "struct statfs". This had the interesting
effect of making the NFSv4 mounts "disappear" after r221014,
since NFSMNT_NFSV4 and MNT_IGNORE became the same bit.
Move the files used for a diskless NFS root from sys/nfsclient
to sys/nfs in preparation for them to be used by both NFS
clients. Also, move the declaration of the three global data
structures from sys/nfsclient/nfs_vfsops.c to sys/nfs/nfs_diskless.c
so that they are defined when either client uses them.
Reviewed by: jhb
MFC after: 2 weeks
Diffstat (limited to 'sys/amd64')
-rw-r--r-- | sys/amd64/amd64/genassym.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c index 585f274..aba790d 100644 --- a/sys/amd64/amd64/genassym.c +++ b/sys/amd64/amd64/genassym.c @@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$"); #include <netinet/in.h> #include <nfs/nfsproto.h> #include <nfsclient/nfs.h> -#include <nfsclient/nfsdiskless.h> +#include <nfs/nfsdiskless.h> #include <x86/apicreg.h> #include <machine/cpu.h> #include <machine/pcb.h> |