From 2181bc851f3f410e788179d69561561a60b9ee58 Mon Sep 17 00:00:00 2001
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sun, 15 Nov 2009 03:09:50 +0000
Subject: [PATCH] Revert previous change and fix misalignment by using bcopy()
 to copy the file handle from fid_data into fh. This eliminates conditional
 compilation.

Pointed out by:	imp
---
 sys/nfsserver/nfs_fha.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/sys/nfsserver/nfs_fha.c b/sys/nfsserver/nfs_fha.c
index cad13dd0a2d4..0469e4a1880b 100644
--- a/sys/nfsserver/nfs_fha.c
+++ b/sys/nfsserver/nfs_fha.c
@@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/sysproto.h>
 #include <sys/kernel.h>
-#include <sys/endian.h>
 #include <sys/sysctl.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
@@ -207,11 +206,7 @@ fha_extract_info(struct svc_req *req, struct fha_info *i)
 	if (error)
 		goto out;
 
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-	i->fh = le64dec(fh.fh_generic.fh_fid.fid_data);
-#else
-	i->fh = be64dec(fh.fh_generic.fh_fid.fid_data);
-#endif
+	bcopy(fh.fh_generic.fh_fid.fid_data, &i->fh, sizeof(i->fh));
 
 	/* Content ourselves with zero offset for all but reads. */
 	if (procnum != NFSPROC_READ)