vol: Tidy up header includes

Remove headers which are provided by libroken, and reorder header
includes so that they're a bit a more legible.

Change-Id: Ie83e6ed3e6e5eaca063b9c6af836bcdc7decdf84
Reviewed-on: http://gerrit.openafs.org/4421
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/vol/devname.c b/src/vol/devname.c
index c30b155137a82572526cb65e8242d6679d7a70aa..35c2a3ecd6829a2c3f8f72a100d33184bdc3d88d 100644 (file)
--- a/src/vol/devname.c
+++ b/src/vol/devname.c
@@ -12,9 +12,10 @@
 
 #include <roken.h>
 
+#include <ctype.h>
+
 #include <rx/xdr.h>
 #include <afs/afsint.h>
-#include <ctype.h>
 
 #if !defined(AFS_SGI_ENV)
 #ifdef AFS_OSF_ENV

diff --git a/src/vol/ihandle.c b/src/vol/ihandle.c
index 8cc0077faa63744d3ac5eca0dc58e8d578e12328..892853ca98999d9fe6bb6a0d8994c7b352f5f4de 100644 (file)
--- a/src/vol/ihandle.c
+++ b/src/vol/ihandle.c
@@ -18,8 +18,7 @@
 
 #include <limits.h>
 
-#if defined(AFS_SUN5_ENV) || defined(AFS_NBSD_ENV)
-#include <sys/fcntl.h>
+#ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
 

diff --git a/src/vol/listinodes.c b/src/vol/listinodes.c
index 013dfaa76952eee61158eafd8f5f8303f9e53a00..87ed2f39d4dccb50b33e0bf4582c3f955e0df870 100644 (file)
--- a/src/vol/listinodes.c
+++ b/src/vol/listinodes.c
@@ -22,6 +22,8 @@
 
 #include <roken.h>
 
+#include <ctype.h>
+
 #ifndef AFS_NAMEI_ENV
 #if defined(AFS_LINUX20_ENV) || defined(AFS_SUN4_ENV)
 /* ListViceInodes
@@ -40,9 +42,7 @@ ListViceInodes(char *devname, char *mountedOn, FD_t inodeFile,
     return -1;
 }
 #else
-#include <ctype.h>
-#if defined(AFS_SGI_ENV)
-#else
+#if !defined(AFS_SGI_ENV)
 #ifdef AFS_OSF_ENV
 #include <ufs/fs.h>
 #else /* AFS_OSF_ENV */

diff --git a/src/vol/namei_map.c b/src/vol/namei_map.c
index e93b7f4686e6649a896ff73ff1c16d2c44779477..175f172c6caaf7f8cb5e2de5f664703d64a7c0cf 100644 (file)
--- a/src/vol/namei_map.c
+++ b/src/vol/namei_map.c
@@ -1,10 +1,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-#include <sys/types.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <roken.h>
+
 #include <afs/afsutil.h>
 
 int main(int argc, char **argv) {

diff --git a/src/vol/namei_ops.c b/src/vol/namei_ops.c
index 98652a27eeebb30ae44e113f27b88566c0e67316..3df0bc348a979a6f9cc668f33fc44a1fd11765b5 100644 (file)
--- a/src/vol/namei_ops.c
+++ b/src/vol/namei_ops.c
@@ -14,33 +14,22 @@
 
 #include <roken.h>
 
+
 #ifdef AFS_NAMEI_ENV
-#include <stdio.h>
-#include <stdlib.h>
-#ifndef AFS_NT40_ENV
-#include <unistd.h>
-#else
+
+#ifdef HAVE_SYS_FILE_H
+# include <sys/file.h>
+#endif
+
+#ifdef AFS_NT40_ENV
 #define DELETE_ZLC
-#include <io.h>
 #include <windows.h>
 #include <winnt.h>
 #include <winbase.h>
-#include <winsock2.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#endif
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#ifdef AFS_NT40_ENV
 #include <direct.h>
-#else
-#include <sys/file.h>
-#include <sys/param.h>
 #endif
-#include <dirent.h>
+
 #include <afs/afs_assert.h>
-#include <string.h>
 #include <lock.h>
 #include <afs/afsutil.h>
 #include <lwp.h>
@@ -56,6 +45,7 @@
 #include "volume_inline.h"
 #include "common.h"
 #include <afs/errors.h>
+
 #ifdef AFS_NT40_ENV
 #include <afs/errmap_nt.h>
 #endif

diff --git a/src/vol/ntops.c b/src/vol/ntops.c
index 645be227ea0c88b7424502474bcf740ca9d4773b..5be28ef109bd9f16f7b4d879f3188148b5c6b9c1 100644 (file)
--- a/src/vol/ntops.c
+++ b/src/vol/ntops.c
@@ -15,14 +15,7 @@
 #include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <direct.h>
-#include <io.h>
-#include <fcntl.h>
-#include <sys/stat.h>
 #include <windows.h>
 #include <winnt.h>
 #include <winbase.h>

diff --git a/src/vol/nuke.c b/src/vol/nuke.c
index b684811eacad2e000bb7a7f428d46799aee623f1..9d882e71f673258e72f39a3ae23b3af3e0650954 100644 (file)
--- a/src/vol/nuke.c
+++ b/src/vol/nuke.c
@@ -14,19 +14,7 @@
 
 #include <rx/xdr.h>
 #include <afs/afsint.h>
-#include <stdio.h>
 #include <afs/afs_assert.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#if defined(AFS_SUN5_ENV) || defined(AFS_NT40_ENV)
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-#ifndef AFS_NT40_ENV
-#include <unistd.h>
-#endif
 
 #include <afs/afsutil.h>
 

diff --git a/src/vol/partition.c b/src/vol/partition.c
index 2fec1bb8ecfd3bc972f3eb3c982954eae19acbff..0cbc462663474448d517792def66f76565cff6ff 100644 (file)
--- a/src/vol/partition.c
+++ b/src/vol/partition.c
@@ -24,15 +24,12 @@
 #include <roken.h>
 
 #include <ctype.h>
-#include <string.h>
+
 #ifdef AFS_NT40_ENV
 #include <windows.h>
 #include <winbase.h>
 #include <winioctl.h>
 #else
-#include <sys/param.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #if AFS_HAVE_STATVFS || AFS_HAVE_STATVFS64
 #include <sys/statvfs.h>
@@ -64,9 +61,6 @@
 #endif
 #endif /* AFS_VFSINCL_ENV */
 #endif /* AFS_OSF_ENV */
-#include <errno.h>
-#include <sys/stat.h>
-#include <stdio.h>
 #include <sys/file.h>
 #ifdef AFS_AIX_ENV
 #include <sys/vfs.h>
@@ -74,8 +68,6 @@
 #else
 #ifdef AFS_HPUX_ENV
 #include <sys/vfs.h>
-#include <unistd.h>
-#include <fcntl.h>
 #include <checklist.h>
 #else
 #if    defined(AFS_SUN_ENV)
@@ -101,9 +93,6 @@
 #endif /* AFS_SGI_ENV */
 #endif /* AFS_NT40_ENV */
 #if defined(AFS_SGI_ENV)
-#include <sys/errno.h>
-#include <sys/stat.h>
-#include <stdio.h>
 #include <sys/file.h>
 #include <mntent.h>
 #endif

diff --git a/src/vol/physio.c b/src/vol/physio.c
index c5faa2654f567863265a23fcbeed8e7b294995e8..d7191b9c29607612255848a72d0aa131304e0ab3 100644 (file)
--- a/src/vol/physio.c
+++ b/src/vol/physio.c
@@ -19,19 +19,12 @@
 
 #include <roken.h>
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <errno.h>
-#ifdef AFS_NT40_ENV
-#include <fcntl.h>
-#else
+#include <assert.h>
+
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
-#include <unistd.h>
-#include <string.h>
-#ifdef AFS_SUN5_ENV
-#include <sys/fcntl.h>
-#endif
 #endif
+
 #include <rx/xdr.h>
 #include <afs/afsint.h>
 #include <errno.h>
@@ -40,7 +33,6 @@
 #include "ihandle.h"
 #include "salvage.h"
 #include <afs/dir.h>
-#include <assert.h>
 #include "vol_internal.h"
 
 /* returns 0 on success, errno on failure */

diff --git a/src/vol/purge.c b/src/vol/purge.c
index 037f96f47fa3d3de722d5407e2fac997f500da79..fb5ac8708015bfe9ed9a544d4f0a38edf958b203 100644 (file)
--- a/src/vol/purge.c
+++ b/src/vol/purge.c
@@ -18,18 +18,10 @@
 
 #include <roken.h>
 
-#include <stdio.h>
-#ifdef AFS_NT40_ENV
-#include <fcntl.h>
-#include <io.h>
-#else
-#include <sys/param.h>
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
-#include <sys/time.h>
-#include <unistd.h>
 #endif
-#include <string.h>
-#include <sys/stat.h>
+
 #include <afs/afs_assert.h>
 #include <afs/afsutil.h>
 

diff --git a/src/vol/salvaged.c b/src/vol/salvaged.c
index d977df900ee1fc95c4e6793bfd0ca7daef0497b2..d24b9f6df07fa90e415e0cf3988763ddb4b53da8 100644 (file)
--- a/src/vol/salvaged.c
+++ b/src/vol/salvaged.c
@@ -20,29 +20,22 @@
 
 #include <roken.h>
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <errno.h>
+#ifdef HAVE_SYS_FILE_H
+#include <sys/file.h>
+#endif
+
 #ifdef AFS_NT40_ENV
-#include <io.h>
 #include <WINNT/afsevent.h>
-#else
-#include <sys/param.h>
-#include <sys/file.h>
-#ifndef ITIMER_REAL
-#include <sys/time.h>
-#endif /* ITIMER_REAL */
 #endif
+
 #ifndef WCOREDUMP
 #define WCOREDUMP(x)   ((x) & 0200)
 #endif
+
 #include <rx/xdr.h>
 #include <afs/afsint.h>
 #include <afs/afs_assert.h>
+
 #if !defined(AFS_SGI_ENV) && !defined(AFS_NT40_ENV)
 #if defined(AFS_VFSINCL_ENV)
 #include <sys/vnode.h>
@@ -71,17 +64,13 @@
 #include <sys/lockf.h>
 #else
 #ifdef AFS_HPUX_ENV
-#include <unistd.h>
 #include <checklist.h>
 #else
 #if defined(AFS_SGI_ENV)
-#include <unistd.h>
-#include <fcntl.h>
 #include <mntent.h>
 #else
 #if    defined(AFS_SUN_ENV) || defined(AFS_SUN5_ENV)
 #ifdef   AFS_SUN5_ENV
-#include <unistd.h>
 #include <sys/mnttab.h>
 #include <sys/mntent.h>
 #else
@@ -92,7 +81,6 @@
 #endif /* AFS_HPUX_ENV */
 #endif
 #endif
-#include <fcntl.h>
 #ifndef AFS_NT40_ENV
 #include <afs/osi_inode.h>
 #endif
@@ -101,9 +89,6 @@
 #include <afs/fileutil.h>
 #include <afs/procmgmt.h>      /* signal(), kill(), wait(), etc. */
 #include <afs/dir.h>
-#ifndef AFS_NT40_ENV
-#include <syslog.h>
-#endif
 
 #include "nfs.h"
 #include "lwp.h"

diff --git a/src/vol/salvager.c b/src/vol/salvager.c
index d3deab81e98e3e4210123fd67f88a4b24d0b1502..892bd775fcbbd97e54697fdb6f48d840702661c0 100644 (file)
--- a/src/vol/salvager.c
+++ b/src/vol/salvager.c
@@ -23,26 +23,18 @@
 #include <afs/procmgmt.h>
 #include <roken.h>
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <errno.h>
+#ifdef HAVE_SYS_FILE_H
+#include <sys/file.h>
+#endif
+
 #ifdef AFS_NT40_ENV
-#include <io.h>
 #include <WINNT/afsevent.h>
-#else
-#include <sys/param.h>
-#include <sys/file.h>
-#ifndef ITIMER_REAL
-#include <sys/time.h>
-#endif /* ITIMER_REAL */
 #endif
+
 #ifndef WCOREDUMP
 #define WCOREDUMP(x)   ((x) & 0200)
 #endif
+
 #include <rx/xdr.h>
 #include <afs/afsint.h>
 #include <afs/afs_assert.h>
@@ -74,17 +66,13 @@
 #include <sys/lockf.h>
 #else
 #ifdef AFS_HPUX_ENV
-#include <unistd.h>
 #include <checklist.h>
 #else
 #if defined(AFS_SGI_ENV)
-#include <unistd.h>
-#include <fcntl.h>
 #include <mntent.h>
 #else
 #if    defined(AFS_SUN_ENV) || defined(AFS_SUN5_ENV)
 #ifdef   AFS_SUN5_ENV
-#include <unistd.h>
 #include <sys/mnttab.h>
 #include <sys/mntent.h>
 #else
@@ -95,7 +83,6 @@
 #endif /* AFS_HPUX_ENV */
 #endif
 #endif
-#include <fcntl.h>
 #ifndef AFS_NT40_ENV
 #include <afs/osi_inode.h>
 #endif
@@ -103,9 +90,6 @@
 #include <afs/dir.h>
 #include <afs/afsutil.h>
 #include <afs/fileutil.h>
-#ifndef AFS_NT40_ENV
-#include <syslog.h>
-#endif
 
 #include "nfs.h"
 #include "lwp.h"

diff --git a/src/vol/salvsync-client.c b/src/vol/salvsync-client.c
index 691d82a2664528d8f7c5dd513de19b62f6c0e221..27433752df78c9004652a2f16c8529b00b3bc2ca 100644 (file)
--- a/src/vol/salvsync-client.c
+++ b/src/vol/salvsync-client.c
@@ -19,21 +19,9 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#include <stdio.h>
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
-#include <time.h>
-#else
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/time.h>
 #endif
-#include <errno.h>
-#include <signal.h>
-#include <string.h>
 
 #include <rx/xdr.h>
 #include <afs/afsint.h>

diff --git a/src/vol/salvsync-server.c b/src/vol/salvsync-server.c
index f054dd6c6512ecff81fb1f3cafa1beadc7634c55..73d25c92bb71f0855074def48b2196d370fc6bcc 100644 (file)
--- a/src/vol/salvsync-server.c
+++ b/src/vol/salvsync-server.c
@@ -26,25 +26,16 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <afs/procmgmt.h>
+#include <roken.h>
+
+#include <stddef.h>
 
-#include <sys/types.h>
-#include <stdio.h>
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
-#include <time.h>
-#else
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/time.h>
 #endif
-#include <errno.h>
-#include <afs/afs_assert.h>
-#include <signal.h>
-#include <string.h>
-
 
+#include <afs/afs_assert.h>
 #include <rx/xdr.h>
 #include <afs/afsint.h>
 #include "nfs.h"
@@ -59,11 +50,6 @@
 #include "partition.h"
 #include "common.h"
 #include <rx/rx_queue.h>
-#include <afs/procmgmt.h>
-
-#if !defined(offsetof)
-#include <stddef.h>
-#endif
 
 #ifdef USE_UNIX_SOCKETS
 #include <afs/afsutil.h>

diff --git a/src/vol/vg_cache.c b/src/vol/vg_cache.c
index f8c736ec78adcc19a2bd60dc7b8883ed7a332115..fac9441b3eacefce04d799830ca430c0c946453d 100644 (file)
--- a/src/vol/vg_cache.c
+++ b/src/vol/vg_cache.c
@@ -17,25 +17,14 @@
 
 #include <roken.h>
 
+#ifdef HAVE_SYS_FILE_H
+#include <sys/file.h>
+#endif
+
 #ifdef AFS_DEMAND_ATTACH_FS
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <dirent.h>
 #include <afs/afs_assert.h>
-#include <string.h>
-#ifdef AFS_NT40_ENV
-#include <io.h>
-#else
-#include <sys/file.h>
-#include <sys/param.h>
-#if defined(AFS_SUN5_ENV) || defined(AFS_HPUX_ENV)
-#include <unistd.h>
-#endif
-#endif /* AFS_NT40_ENV */
+
 #include <lock.h>
 #include <afs/afsutil.h>
 #include <lwp.h>

diff --git a/src/vol/vg_scan.c b/src/vol/vg_scan.c
index 93a28015d974c4b1587249f619b75ec9ebc99073..7fc212ecd73f408c31dc1712063e6a44553a7493 100644 (file)
--- a/src/vol/vg_scan.c
+++ b/src/vol/vg_scan.c
@@ -18,25 +18,13 @@
 
 #include <roken.h>
 
+#ifdef HAVE_SYS_FILE_H
+#include <sys/file.h>
+#endif
+
 #ifdef AFS_DEMAND_ATTACH_FS
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <dirent.h>
 #include <afs/afs_assert.h>
-#include <string.h>
-#ifdef AFS_NT40_ENV
-#include <io.h>
-#else
-#include <sys/file.h>
-#include <sys/param.h>
-#if defined(AFS_SUN5_ENV) || defined(AFS_HPUX_ENV)
-#include <unistd.h>
-#endif
-#endif /* AFS_NT40_ENV */
 #include <lock.h>
 #include <afs/afsutil.h>
 #include <lwp.h>

diff --git a/src/vol/vnode.c b/src/vol/vnode.c
index 209d952e123bc9fd519a4cff2d77272c5653ab75..531c48a7dfcae80804b077eef82e20ace7a1f7b8 100644 (file)
--- a/src/vol/vnode.c
+++ b/src/vol/vnode.c
@@ -22,10 +22,10 @@
 
 #include <limits.h>
 
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
+#ifdef HAVE_SYS_FILE_H
+#include <sys/file.h>
+#endif
+
 #include <afs/afs_assert.h>
 
 #include <rx/xdr.h>
@@ -44,27 +44,8 @@
 #include "partition.h"
 #include "salvsync.h"
 #include "common.h"
-#if defined(AFS_SGI_ENV)
-#include "sys/types.h"
-#include "fcntl.h"
-#undef min
-#undef max
-#include "stdlib.h"
-#endif
 #ifdef AFS_NT40_ENV
-#include <fcntl.h>
 #include "ntops.h"
-#else
-#include <sys/file.h>
-#ifdef AFS_SUN5_ENV
-#include <sys/fcntl.h>
-#endif
-#include <unistd.h>
-#endif /* AFS_NT40_ENV */
-#include <sys/stat.h>
-
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
 #endif
 
 struct VnodeClassInfo VnodeClassInfo[nVNODECLASSES];

diff --git a/src/vol/vol-bless.c b/src/vol/vol-bless.c
index 6f4eb8fa1f6efff5d6db68304bd76d6a34ad25dd..158c37f85d142977ec192393be9e216100608f4a 100644 (file)
--- a/src/vol/vol-bless.c
+++ b/src/vol/vol-bless.c
@@ -10,8 +10,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
-#include <stdio.h>
+#include <roken.h>
 
 #include <afs/cmd.h>
 

diff --git a/src/vol/vol-info.c b/src/vol/vol-info.c
index 6a95cbd3bfc2519dc0fa1c8ae0722480798fc72e..e821223c7bfb390a1ec382cfe272d27d341e594c 100644 (file)
--- a/src/vol/vol-info.c
+++ b/src/vol/vol-info.c
@@ -20,19 +20,11 @@
 #include <roken.h>
 
 #include <ctype.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <string.h>
-#ifdef AFS_NT40_ENV
-#include <fcntl.h>
-#include <time.h>
-#include <io.h>
-#else
-#include <sys/param.h>
+
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
-#include <sys/time.h>
 #endif
+
 #include <afs/cmd.h>
 #include <afs/dir.h>
 
@@ -51,12 +43,6 @@
 #include <afs/afssyscalls.h>
 #include <afs/afsutil.h>
 
-#ifdef _AIX
-#include <time.h>
-#endif
-
-#include <dirent.h>
-
 int DumpVnodes = 0;            /* Dump everything, i.e. summary of all vnodes */
 int DumpInodeNumber = 0;       /* Dump inode numbers with vnodes */
 int DumpDate = 0;              /* Dump vnode date (server modify date) with vnode */

diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c
index b212265b28b48fbff8746d55d485025e831273b6..f017392d34cf258cef2cd1c44554c73d5c755f47 100644 (file)
--- a/src/vol/vol-salvage.c
+++ b/src/vol/vol-salvage.c
@@ -89,22 +89,11 @@ Vnodes with 0 inode pointers in RW volumes are now deleted.
 #include <afs/procmgmt.h>
 #include <roken.h>
 
-#ifndef AFS_NT40_ENV
-#include <sys/param.h>
-#include <sys/file.h>
-#ifndef ITIMER_REAL
-#include <sys/time.h>
-#endif /* ITIMER_REAL */
+#ifdef HAVE_SYS_FILE_H
+# include <sys/file.h>
 #endif
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <errno.h>
+
 #ifdef AFS_NT40_ENV
-#include <io.h>
 #include <WINNT/afsevent.h>
 #endif
 #ifndef WCOREDUMP
@@ -141,17 +130,13 @@ Vnodes with 0 inode pointers in RW volumes are now deleted.
 #include <sys/lockf.h>
 #else
 #ifdef AFS_HPUX_ENV
-#include <unistd.h>
 #include <checklist.h>
 #else
 #if defined(AFS_SGI_ENV)
-#include <unistd.h>
-#include <fcntl.h>
 #include <mntent.h>
 #else
 #if    defined(AFS_SUN_ENV) || defined(AFS_SUN5_ENV)
 #ifdef   AFS_SUN5_ENV
-#include <unistd.h>
 #include <sys/mnttab.h>
 #include <sys/mntent.h>
 #else
@@ -162,7 +147,6 @@ Vnodes with 0 inode pointers in RW volumes are now deleted.
 #endif /* AFS_HPUX_ENV */
 #endif
 #endif
-#include <fcntl.h>
 #ifndef AFS_NT40_ENV
 #include <afs/osi_inode.h>
 #endif
@@ -170,10 +154,6 @@ Vnodes with 0 inode pointers in RW volumes are now deleted.
 #include <afs/dir.h>
 #include <afs/afsutil.h>
 #include <afs/fileutil.h>
-#include <afs/procmgmt.h>      /* signal(), kill(), wait(), etc. */
-#ifndef AFS_NT40_ENV
-#include <syslog.h>
-#endif
 
 #include "nfs.h"
 #include "lwp.h"

diff --git a/src/vol/volume.c b/src/vol/volume.c
index bf8c02b33ffbcee94e0fa907110fb0187857ad2f..63fff05976996b33ed65e3b9b8bb2a3d56ffa812 100644 (file)
--- a/src/vol/volume.c
+++ b/src/vol/volume.c
@@ -23,12 +23,17 @@
 
 #include <roken.h>
 
+#include <ctype.h>
+#include <stddef.h>
+
+#ifdef HAVE_SYS_FILE_H
+#include <sys/file.h>
+#endif
+
 #include <rx/xdr.h>
 #include <afs/afsint.h>
-#include <ctype.h>
-#include <signal.h>
+
 #ifndef AFS_NT40_ENV
-#include <sys/param.h>
 #if !defined(AFS_SGI_ENV)
 #ifdef AFS_OSF_ENV
 #include <ufs/fs.h>
@@ -52,22 +57,12 @@
 #endif /* AFS_VFSINCL_ENV */
 #endif /* AFS_OSF_ENV */
 #endif /* AFS_SGI_ENV */
-#endif /* AFS_NT40_ENV */
-#include <errno.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#ifdef AFS_NT40_ENV
-#include <fcntl.h>
-#else
-#include <sys/file.h>
-#endif
-#include <dirent.h>
+#endif /* !AFS_NT40_ENV */
+
 #ifdef AFS_AIX_ENV
 #include <sys/vfs.h>
-#include <fcntl.h>
 #else
 #ifdef AFS_HPUX_ENV
-#include <fcntl.h>
 #include <mntent.h>
 #else
 #if    defined(AFS_SUN_ENV) || defined(AFS_SUN5_ENV)
@@ -80,9 +75,7 @@
 #else
 #ifndef AFS_NT40_ENV
 #if defined(AFS_SGI_ENV)
-#include <fcntl.h>
 #include <mntent.h>
-
 #else
 #ifndef AFS_LINUX20_ENV
 #include <fstab.h>             /* Need to find in libc 5, present in libc 6 */
@@ -92,20 +85,6 @@
 #endif
 #endif /* AFS_HPUX_ENV */
 #endif
-#ifndef AFS_NT40_ENV
-#include <netdb.h>
-#include <netinet/in.h>
-#include <sys/wait.h>
-#include <setjmp.h>
-#ifndef ITIMER_REAL
-#include <sys/time.h>
-#endif /* ITIMER_REAL */
-#endif /* AFS_NT40_ENV */
-#if defined(AFS_SUN5_ENV) || defined(AFS_NT40_ENV) || defined(AFS_LINUX20_ENV)
-#include <string.h>
-#else
-#include <strings.h>
-#endif
 
 #include "nfs.h"
 #include <afs/errors.h>
@@ -114,9 +93,6 @@
 #include <afs/afssyscalls.h>
 #include "ihandle.h"
 #include <afs/afsutil.h>
-#ifdef AFS_NT40_ENV
-#include <io.h>
-#endif
 #include "daemon_com.h"
 #include "fssync.h"
 #include "salvsync.h"
@@ -128,13 +104,6 @@
 #include "afs/afs_assert.h"
 #include "vutils.h"
 #include <afs/dir.h>
-#ifndef AFS_NT40_ENV
-#include <unistd.h>
-#endif
-
-#if !defined(offsetof)
-#include <stddef.h>
-#endif
 
 #ifdef AFS_PTHREAD_ENV
 pthread_mutex_t vol_glock_mutex;

diff --git a/src/vol/vutil.c b/src/vol/vutil.c
index b9183899396d0bf5d1b1fc4b9ee5e89053e96484..396832d51bf3e0d1b7f2430afc6ea08031984125 100644 (file)
--- a/src/vol/vutil.c
+++ b/src/vol/vutil.c
@@ -19,19 +19,14 @@
 
 #include <roken.h>
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <errno.h>
-#ifdef AFS_NT40_ENV
-#include <time.h>
-#include <fcntl.h>
-#else
-#include <sys/time.h>
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
-#include <unistd.h>
 #endif
-#include <dirent.h>
-#include <sys/stat.h>
+
+#ifdef HAVE_SYS_LOCKF_H
+#include <sys/lockf.h>
+#endif
+
 #include <afs/afs_assert.h>
 
 #include <rx/xdr.h>
@@ -45,7 +40,6 @@
 #include <afs/afsutil.h>
 #ifdef AFS_NT40_ENV
 #include "ntops.h"
-#include <io.h>
 #endif
 #include "vnode.h"
 #include "volume.h"
@@ -57,15 +51,6 @@
 #include "vol_prototypes.h"
 #include "common.h"
 
-#ifdef AFS_AIX_ENV
-#include <sys/lockf.h>
-#endif
-#if defined(AFS_SUN5_ENV) || defined(AFS_NT40_ENV) || defined(AFS_LINUX20_ENV)
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #ifndef AFS_NT40_ENV
 # ifdef O_LARGEFILE
 #  define AFS_SETLKW   F_SETLKW64

diff --git a/src/vol/xfs_size_check.c b/src/vol/xfs_size_check.c
index 24df654afe8a1e73b05001af2853d046a3f47111..103c342444df7ffff383cb1cacb24a530c32f196 100644 (file)
--- a/src/vol/xfs_size_check.c
+++ b/src/vol/xfs_size_check.c
@@ -9,18 +9,15 @@
 
 /* Verify that the size of the XFS inode is large enough to hold the XFS
  * attribute for AFS inode parameters. Check all the mounted /vicep partitions.
+ */
 #include <afsconfig.h>
+#include <afs/param.h>
 
+#include <roken.h>
 
- */
-#include <afs/param.h>
 #ifdef AFS_SGI_XFS_IOPS_ENV
-#include <errno.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <dirent.h>
-#include <fcntl.h>
 #include <mntent.h>
+#include <afs/afsint.h>
 #include "ihandle.h"
 #include "partition.h"
 #include <afs/xfsattrs.h>