d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Exclude options COMPAT_FREEBSD4 now that the MD freebsd4_sigreturn()

Browse Source 
is gone since r201396 and which is also in line with the fact that
FreeBSD 4 didn't supported sparc64.

PR:		142102 (second part)
MFC after:	1 week
This commit is contained in:
Marius Strobl 2010-01-09 15:31:27 +00:00
parent 5d005b51e5
commit 816bf02c2d
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/nfsserver/nfs.h
View File

@ -240,6 +240,7 @@ extern int nfs_debug;
#endif
void nfs_realign(struct mbuf **);
struct mbuf *nfs_rephead(int, struct nfsrv_descript *, int, struct mbuf **,
caddr_t *);
void nfsm_srvfattr(struct nfsrv_descript *, struct vattr *,

8
sys/nfsserver/nfs_fha.c
View File

@ -158,9 +158,9 @@ SYSUNINIT(nfs_fha, SI_SUB_ROOT_CONF, SI_ORDER_ANY, nfs_fha_uninit, NULL);
static void
fha_extract_info(struct svc_req *req, struct fha_info *i)
{
struct mbuf *md = req->rq_args;
struct mbuf *md;
nfsfh_t fh;
caddr_t dpos = mtod(md, caddr_t);
caddr_t dpos;
static u_int64_t random_fh = 0;
int error;
int v3 = (req->rq_vers == 3);
@ -201,6 +201,10 @@ fha_extract_info(struct svc_req *req, struct fha_info *i)
procnum == NFSPROC_NULL)
goto out;
nfs_realign(&req->rq_args);
md = req->rq_args;
dpos = mtod(md, caddr_t);
/* Grab the filehandle. */
error = nfsm_srvmtofh_xx(&fh.fh_generic, v3, &md, &dpos);
if (error)

2
sys/nfsserver/nfs_srvkrpc.c
View File

@ -266,7 +266,7 @@ nfs_rephead(int siz, struct nfsrv_descript *nd, int err,
* not occur with NFS/UDP and is supposed to only occassionally occur
* with TCP. Use vfs.nfs.realign_count and realign_test to check this.
*/
static void
void
nfs_realign(struct mbuf **pm) /* XXX COMMON */
{
struct mbuf *m;