Attachment #6989 for bug #15452

View | Details | Raw Unified | Return to bug 15452
Collapse All | Expand All

Lines 248-254 Link Here

(-)kern/syscalls.master (-1 / +1 lines)
248	159 UNIMPL NOHIDE nosys	248	159 UNIMPL NOHIDE nosys
249	160 UNIMPL NOHIDE nosys	249	160 UNIMPL NOHIDE nosys
250	; 161 is initialized by the NFS code, if present.	250	; 161 is initialized by the NFS code, if present.
251	161 NOIMPL BSD { int getfh(char fname, struct fhandle fhp); }	251	161 STD BSD { int getfh(char fname, struct fhandle fhp); }
252	162 STD BSD { int getdomainname(char *domainname, int len); }	252	162 STD BSD { int getdomainname(char *domainname, int len); }
253	163 STD BSD { int setdomainname(char *domainname, int len); }	253	163 STD BSD { int setdomainname(char *domainname, int len); }
254	164 STD BSD { int uname(struct utsname *name); }	254	164 STD BSD { int uname(struct utsname *name); }




#ifndef NFS_NOSERVER

static vop_t *nfs_prev_vop_lease_check;
static int nfs_prev_getfh_sy_narg;
static sy_call_t *nfs_prev_getfh_sy_call;

/*
 * Mapping of old NFS Version 2 RPC numbers to generic numbers.

extern struct nfsnodehashhead *nfsnodehashtbl;
extern u_long nfsnodehash;

struct getfh_args;
extern int getfh(struct proc *, struct getfh_args *, int *);
struct nfssvc_args;
extern int nfssvc(struct proc *, struct nfssvc_args *, int *);


	sysent[SYS_nfssvc].sy_narg = 2;
	nfs_prev_nfssvc_sy_call = sysent[SYS_nfssvc].sy_call;
	sysent[SYS_nfssvc].sy_call = (sy_call_t *)nfssvc;
#ifndef NFS_NOSERVER
	nfs_prev_getfh_sy_narg = sysent[SYS_getfh].sy_narg;
	sysent[SYS_getfh].sy_narg = 2;
	nfs_prev_getfh_sy_call = sysent[SYS_getfh].sy_call;
	sysent[SYS_getfh].sy_call = (sy_call_t *)getfh;
#endif

	nfs_pbuf_freecnt = nswbuf / 2 + 1;


	lease_updatetime = nfs_prev_lease_updatetime;
	sysent[SYS_nfssvc].sy_narg = nfs_prev_nfssvc_sy_narg;
	sysent[SYS_nfssvc].sy_call = nfs_prev_nfssvc_sy_call;
#ifndef NFS_NOSERVER
	sysent[SYS_getfh].sy_narg = nfs_prev_getfh_sy_narg;
	sysent[SYS_getfh].sy_call = nfs_prev_getfh_sy_call;
#endif
	return (0);
}

Return to bug 15452

Lines 117-124 Link Here

(-)nfs/nfs_subs.c (-14 lines)
117	#ifndef NFS_NOSERVER	117	#ifndef NFS_NOSERVER
118		118
119	static vop_t *nfs_prev_vop_lease_check;	119	static vop_t *nfs_prev_vop_lease_check;
120	static int nfs_prev_getfh_sy_narg;
121	static sy_call_t *nfs_prev_getfh_sy_call;
122		120
123	/*	121	/*
124	* Mapping of old NFS Version 2 RPC numbers to generic numbers.	122	* Mapping of old NFS Version 2 RPC numbers to generic numbers.
Lines 558-565 Link Here
558	extern struct nfsnodehashhead *nfsnodehashtbl;	556	extern struct nfsnodehashhead *nfsnodehashtbl;
559	extern u_long nfsnodehash;	557	extern u_long nfsnodehash;
560		558
561	struct getfh_args;
562	extern int getfh(struct proc , struct getfh_args , int *);
563	struct nfssvc_args;	559	struct nfssvc_args;
564	extern int nfssvc(struct proc , struct nfssvc_args , int *);	560	extern int nfssvc(struct proc , struct nfssvc_args , int *);
565		561
Lines 1184-1195 Link Here
1184	sysent[SYS_nfssvc].sy_narg = 2;	1180	sysent[SYS_nfssvc].sy_narg = 2;
1185	nfs_prev_nfssvc_sy_call = sysent[SYS_nfssvc].sy_call;	1181	nfs_prev_nfssvc_sy_call = sysent[SYS_nfssvc].sy_call;
1186	sysent[SYS_nfssvc].sy_call = (sy_call_t *)nfssvc;	1182	sysent[SYS_nfssvc].sy_call = (sy_call_t *)nfssvc;
1187	#ifndef NFS_NOSERVER
1188	nfs_prev_getfh_sy_narg = sysent[SYS_getfh].sy_narg;
1189	sysent[SYS_getfh].sy_narg = 2;
1190	nfs_prev_getfh_sy_call = sysent[SYS_getfh].sy_call;
1191	sysent[SYS_getfh].sy_call = (sy_call_t *)getfh;
1192	#endif
1193		1183
1194	nfs_pbuf_freecnt = nswbuf / 2 + 1;	1184	nfs_pbuf_freecnt = nswbuf / 2 + 1;
1195		1185
Lines 1209-1218 Link Here
1209	lease_updatetime = nfs_prev_lease_updatetime;	1199	lease_updatetime = nfs_prev_lease_updatetime;
1210	sysent[SYS_nfssvc].sy_narg = nfs_prev_nfssvc_sy_narg;	1200	sysent[SYS_nfssvc].sy_narg = nfs_prev_nfssvc_sy_narg;
1211	sysent[SYS_nfssvc].sy_call = nfs_prev_nfssvc_sy_call;	1201	sysent[SYS_nfssvc].sy_call = nfs_prev_nfssvc_sy_call;
1212	#ifndef NFS_NOSERVER
1213	sysent[SYS_getfh].sy_narg = nfs_prev_getfh_sy_narg;
1214	sysent[SYS_getfh].sy_call = nfs_prev_getfh_sy_call;
1215	#endif
1216	return (0);	1202	return (0);
1217	}	1203	}