Page MenuHomeFreeBSD
Files F140095851

D22933.id66123.diff
No OneTemporary
Actions

D22933.id66123.diff
View Options

Index: conf/files
===================================================================
--- conf/files
+++ conf/files
@@ -3492,10 +3492,10 @@
fs/msdosfs/msdosfs_lookup.c optional msdosfs
fs/msdosfs/msdosfs_vfsops.c optional msdosfs
fs/msdosfs/msdosfs_vnops.c optional msdosfs
-fs/nfs/nfs_commonkrpc.c optional nfscl | nfsd
-fs/nfs/nfs_commonsubs.c optional nfscl | nfsd
-fs/nfs/nfs_commonport.c optional nfscl | nfsd
-fs/nfs/nfs_commonacl.c optional nfscl | nfsd
+fs/nfs/nfs_commonkrpc.c optional nfscl | nfslockd | nfsd
+fs/nfs/nfs_commonsubs.c optional nfscl | nfslockd | nfsd
+fs/nfs/nfs_commonport.c optional nfscl | nfslockd | nfsd
+fs/nfs/nfs_commonacl.c optional nfscl | nfslockd | nfsd
fs/nfsclient/nfs_clcomsubs.c optional nfscl
fs/nfsclient/nfs_clsubs.c optional nfscl
fs/nfsclient/nfs_clstate.c optional nfscl
@@ -4436,8 +4436,7 @@
nfs/krpc_subr.c optional bootp nfscl
nfs/nfs_diskless.c optional nfscl nfs_root
nfs/nfs_fha.c optional nfsd
-nfs/nfs_lock.c optional nfscl | nfslockd | nfsd
-nfs/nfs_nfssvc.c optional nfscl | nfsd
+nfs/nfs_nfssvc.c optional nfscl | nfslockd | nfsd
nlm/nlm_advlock.c optional nfslockd | nfsd
nlm/nlm_prot_clnt.c optional nfslockd | nfsd
nlm/nlm_prot_impl.c optional nfslockd | nfsd
Index: fs/nfs/nfs_commonport.c
===================================================================
--- fs/nfs/nfs_commonport.c
+++ fs/nfs/nfs_commonport.c
@@ -74,6 +74,8 @@
volatile int nfsrv_devidcnt = 0;
void (*nfsd_call_servertimer)(void) = NULL;
void (*ncl_call_invalcaches)(struct vnode *) = NULL;
+vop_advlock_t *nfs_advlock_p = NULL;
+vop_reclaim_t *nfs_reclaim_p = NULL;
int nfs_pnfsio(task_fn_t *, void *);
Index: fs/nfsclient/nfs_clport.c
===================================================================
--- fs/nfsclient/nfs_clport.c
+++ fs/nfsclient/nfs_clport.c
@@ -1411,5 +1411,4 @@
MODULE_DEPEND(nfscl, nfscommon, 1, 1, 1);
MODULE_DEPEND(nfscl, krpc, 1, 1, 1);
MODULE_DEPEND(nfscl, nfssvc, 1, 1, 1);
-MODULE_DEPEND(nfscl, nfslock, 1, 1, 1);
Index: fs/nfsclient/nfs_clvfsops.c
===================================================================
--- fs/nfsclient/nfs_clvfsops.c
+++ fs/nfsclient/nfs_clvfsops.c
@@ -152,7 +152,6 @@
MODULE_DEPEND(nfs, nfscommon, 1, 1, 1);
MODULE_DEPEND(nfs, krpc, 1, 1, 1);
MODULE_DEPEND(nfs, nfssvc, 1, 1, 1);
-MODULE_DEPEND(nfs, nfslock, 1, 1, 1);
/*
* This structure is now defined in sys/nfs/nfs_diskless.c so that it
Index: fs/nfsserver/nfs_nfsdport.c
===================================================================
--- fs/nfsserver/nfs_nfsdport.c
+++ fs/nfsserver/nfs_nfsdport.c
@@ -6443,7 +6443,6 @@
/* So that loader and kldload(2) can find us, wherever we are.. */
MODULE_VERSION(nfsd, 1);
MODULE_DEPEND(nfsd, nfscommon, 1, 1, 1);
-MODULE_DEPEND(nfsd, nfslock, 1, 1, 1);
MODULE_DEPEND(nfsd, nfslockd, 1, 1, 1);
MODULE_DEPEND(nfsd, krpc, 1, 1, 1);
MODULE_DEPEND(nfsd, nfssvc, 1, 1, 1);
Index: kern/kern_exit.c
===================================================================
--- kern/kern_exit.c
+++ kern/kern_exit.c
@@ -97,9 +97,6 @@
SDT_PROVIDER_DECLARE(proc);
SDT_PROBE_DEFINE1(proc, , , exit, "int");
-/* Hook for NFS teardown procedure. */
-void (*nlminfo_release_p)(struct proc *p);
-
struct proc *
proc_realparent(struct proc *child)
{
@@ -378,12 +375,6 @@
* F_SETOWN with our pid.
*/
funsetownlst(&p->p_sigiolst);
-
- /*
- * If this process has an nlminfo data area (for lockd), release it
- */
- if (nlminfo_release_p != NULL && p->p_nlminfo != NULL)
- (*nlminfo_release_p)(p);
/*
* Close open files and release open-file table.
Index: kern/kern_thread.c
===================================================================
--- kern/kern_thread.c
+++ kern/kern_thread.c
@@ -90,11 +90,11 @@
"struct proc KBI p_flag");
_Static_assert(offsetof(struct proc, p_pid) == 0xbc,
"struct proc KBI p_pid");
-_Static_assert(offsetof(struct proc, p_filemon) == 0x3c8,
+_Static_assert(offsetof(struct proc, p_filemon) == 0x3c0,
"struct proc KBI p_filemon");
-_Static_assert(offsetof(struct proc, p_comm) == 0x3e0,
+_Static_assert(offsetof(struct proc, p_comm) == 0x3d8,
"struct proc KBI p_comm");
-_Static_assert(offsetof(struct proc, p_emuldata) == 0x4c0,
+_Static_assert(offsetof(struct proc, p_emuldata) == 0x4b8,
"struct proc KBI p_emuldata");
#endif
#ifdef __i386__
@@ -110,11 +110,11 @@
"struct proc KBI p_flag");
_Static_assert(offsetof(struct proc, p_pid) == 0x74,
"struct proc KBI p_pid");
-_Static_assert(offsetof(struct proc, p_filemon) == 0x278,
+_Static_assert(offsetof(struct proc, p_filemon) == 0x274,
"struct proc KBI p_filemon");
-_Static_assert(offsetof(struct proc, p_comm) == 0x28c,
+_Static_assert(offsetof(struct proc, p_comm) == 0x288,
"struct proc KBI p_comm");
-_Static_assert(offsetof(struct proc, p_emuldata) == 0x318,
+_Static_assert(offsetof(struct proc, p_emuldata) == 0x314,
"struct proc KBI p_emuldata");
#endif
Index: modules/Makefile
===================================================================
--- modules/Makefile
+++ modules/Makefile
@@ -258,7 +258,6 @@
nfscl \
nfscommon \
nfsd \
- nfslock \
nfslockd \
nfssvc \
nge \
Index: nlm/nlm_prot_impl.c
===================================================================
--- nlm/nlm_prot_impl.c
+++ nlm/nlm_prot_impl.c
@@ -2422,5 +2422,5 @@
/* So that loader and kldload(2) can find us, wherever we are.. */
MODULE_DEPEND(nfslockd, krpc, 1, 1, 1);
-MODULE_DEPEND(nfslockd, nfslock, 1, 1, 1);
+MODULE_DEPEND(nfslockd, nfscommon, 1, 1, 1);
MODULE_VERSION(nfslockd, 1);
Index: sys/proc.h
===================================================================
--- sys/proc.h
+++ sys/proc.h
@@ -182,7 +182,6 @@
struct kdtrace_proc;
struct kdtrace_thread;
struct mqueue_notifier;
-struct nlminfo;
struct p_sched;
struct proc;
struct procdesc;
@@ -625,7 +624,6 @@
char p_step; /* (c) Process is stopped. */
u_char p_pfsflags; /* (c) Procfs flags. */
u_int p_ptevents; /* (c + e) ptrace() event mask. */
- struct nlminfo *p_nlminfo; /* (?) Only used by/for lockd. */
struct kaioinfo *p_aioinfo; /* (y) ASYNC I/O info. */
struct thread *p_singlethread;/* (c + j) If single threading this is it */
int p_suspcount; /* (j) Num threads in suspended mode. */

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 21, 4:19 AM (5 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27106960
Default Alt Text
D22933.id66123.diff (6 KB)

Event Timeline