From: Matt Benjamin <matt@linuxbox.com>
Date: Mon, 12 Jan 2009 14:33:09 +0000 (+0000)
Subject: freebsd-cleanup-20090112
X-Git-Tag: openafs-devel-1_5_61~618
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=ba9556ff2bbf854bb5c05074032b94973bf339ec;hp=45e808945627b36ab1dbb64b6fafa8ed7b1901b6

freebsd-cleanup-20090112

LICENSE IPL10
FIXES 124107

minor freebsd cleanup
---

diff --git a/src/afs/FBSD/osi_vnodeops.c b/src/afs/FBSD/osi_vnodeops.c
index 324c42a..2b401de 100644
--- a/src/afs/FBSD/osi_vnodeops.c
+++ b/src/afs/FBSD/osi_vnodeops.c
@@ -1044,8 +1044,7 @@ afs_vop_ioctl(ap)
     if (((ap->a_command >> 8) & 0xff) == 'V') {
 	/* This is a VICEIOCTL call */
 	AFS_GLOCK();
-	error = HandleIoctl(tvc, NULL /*Not used */ ,
-			    ap->a_command, ap->a_data);
+	error = HandleIoctl(tvc, ap->a_command, ap->a_data);
 	AFS_GUNLOCK();
 	return (error);
     } else {
diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
index 39d76b1..9f41478 100644
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -1192,7 +1192,7 @@ extern int afs_rename(OSI_VC_DECL(aodp), char *aname1, struct vcache *andp,
 #endif
 	
 /* VNOPS/afs_vnop_strategy.c */
-#if defined(AFS_SUN5_ENV) || defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
+#if defined(AFS_SUN5_ENV) || defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV)
 extern int afs_ustrategy(register struct buf *adp, struct AFS_UCRED *credp);
 #else
 extern int afs_ustrategy(register struct buf *adp);
diff --git a/src/libafs/MakefileProto.FBSD.in b/src/libafs/MakefileProto.FBSD.in
index dbbc21b..e10e464 100644
--- a/src/libafs/MakefileProto.FBSD.in
+++ b/src/libafs/MakefileProto.FBSD.in
@@ -34,6 +34,10 @@ AFS_OS_NONFSOBJS = \
 # System specific build commands and flags
 KSRC = @BSD_KERNEL_PATH@
 KBLD = @BSD_KERNEL_BUILD@
+<amd64_fbsd_70 amd64_fbsd_71 amd64_fbsd_80>
+KOPTS = -fPIC
+<all>
+
 KDEFS=-Wall -nostdinc -I/usr/include -D_KERNEL -DKLD_MODULE \
 	-elf \
 <i386_fbsd_42 i386_fbsd_43 i386_fbsd_44 i386_fbsd_45 i386_fbsd_46 i386_fbsd_47>
@@ -46,9 +50,7 @@ KDEFS=-Wall -nostdinc -I/usr/include -D_KERNEL -DKLD_MODULE \
 	-mno-mmx -mno-3dnow -mno-sse -mno-sse2 \
 <all -i386_fbsd_42 -i386_fbsd_43 -i386_fbsd_44 -i386_fbsd_45 -i386_fbsd_46 -i386_fbsd_47>
 	-mno-align-long-strings -fno-common -ffreestanding \
-	-I${KBLD} -include opt_global.h -fno-strict-aliasing \
-<amd64_fbsd_70 amd64_fbsd_71 amd64_fbsd_80>
-KOPTS=-fPIC
+	-I${KBLD} -include opt_global.h -fno-strict-aliasing
 <all>
 
 DBUG = -O2