Author: marius
Date: Sat Jan 9 15:31:27 2010
New Revision: 201896
URL: http://svn.freebsd.org/changeset/base/201896
Log:
Exclude options COMPAT_FREEBSD4 now that the MD freebsd4_sigreturn()
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
Modified:
head/sys/nfsserver/nfs.h
head/sys/nfsserver/nfs_fha.c
head/sys/nfsserver/nfs_srvkrpc.c
Modified: head/sys/nfsserver/nfs.h
==============================================================================
--- head/sys/nfsserver/nfs.h Sat Jan 9 14:56:38 2010 (r201895)
+++ head/sys/nfsserver/nfs.h Sat Jan 9 15:31:27 2010 (r201896)
@@ -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 *,
Modified: head/sys/nfsserver/nfs_fha.c
==============================================================================
--- head/sys/nfsserver/nfs_fha.c Sat Jan 9 14:56:38 2010
(r201895)
+++ head/sys/nfsserver/nfs_fha.c Sat Jan 9 15:31:27 2010
(r201896)
@@ -158,9 +158,9 @@ SYSUNINIT(nfs_fha, SI_SUB_ROOT_CONF, SI_
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, st
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)
Modified: head/sys/nfsserver/nfs_srvkrpc.c
==============================================================================
--- head/sys/nfsserver/nfs_srvkrpc.c Sat Jan 9 14:56:38 2010
(r201895)
+++ head/sys/nfsserver/nfs_srvkrpc.c Sat Jan 9 15:31:27 2010
(r201896)
@@ -266,7 +266,7 @@ nfs_rephead(int siz, struct nfsrv_descri
* 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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
