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/conf | |
| 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/conf')
| -rw-r--r-- | sys/conf/files | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/conf/files b/sys/conf/files index 5cf94cc..a23ff56 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2822,12 +2822,12 @@ netsmb/smb_smb.c optional netsmb netsmb/smb_subr.c optional netsmb netsmb/smb_trantcp.c optional netsmb netsmb/smb_usr.c optional netsmb +nfs/bootp_subr.c optional bootp nfsclient | bootp nfscl +nfs/krpc_subr.c optional bootp nfsclient | bootp nfscl nfs/nfs_common.c optional nfsclient | nfsserver +nfs/nfs_diskless.c optional nfsclient nfs_root | nfscl nfs_root nfs/nfs_lock.c optional nfsclient | nfscl | nfslockd | nfsd -nfsclient/bootp_subr.c optional bootp nfsclient -nfsclient/krpc_subr.c optional bootp nfsclient nfsclient/nfs_bio.c optional nfsclient -nfsclient/nfs_diskless.c optional nfsclient nfs_root nfsclient/nfs_node.c optional nfsclient nfsclient/nfs_krpc.c optional nfsclient nfsclient/nfs_subs.c optional nfsclient |
