--- a/ChangeLog	Tue Oct 16 20:21:30 2018 +0200
+++ b/ChangeLog	Tue Oct 16 20:43:03 2018 +0200
@@ -1,3 +1,11 @@
+2018-10-16  Bruno Haible  <bruno@clisp.org>
+
+	fsusage, stat-size, getloadavg: Remove support for AIX PS/2.
+	* m4/fsusage.m4 (gl_PREREQ_FSUSAGE_EXTRA): Don't check for dustat.h.
+	* lib/fsusage.c: Remove code for AIX PS/2.
+	* lib/stat-size.h (ST_NBLOCKSIZE): Likewise.
+	* lib/getloadavg.c: Likewise.
+
 2018-10-16  Bruno Haible  <bruno@clisp.org>
 
 	getloadavg: Remove support for HP-UX on m68k.

--- a/lib/fsusage.c	Tue Oct 16 20:21:30 2018 +0200
+++ b/lib/fsusage.c	Tue Oct 16 20:43:03 2018 +0200
@@ -46,9 +46,6 @@
 # if HAVE_SYS_STATFS_H
 #  include <sys/statfs.h>
 # endif
-# if HAVE_DUSTAT_H              /* AIX PS/2 */
-#  include <sys/dustat.h>
-# endif
 #endif
 
 /* Many space usage primitives use all 1 bits to denote a value that is
@@ -257,30 +254,3 @@
   (void) disk;  /* avoid argument-unused warning */
   return 0;
 }
-
-#if defined _AIX && defined _I386
-/* AIX PS/2 does not supply statfs.  */
-
-int
-statfs (char *file, struct statfs *fsb)
-{
-  struct stat stats;
-  struct dustat fsd;
-
-  if (stat (file, &stats) != 0)
-    return -1;
-  if (dustat (stats.st_dev, 0, &fsd, sizeof (fsd)))
-    return -1;
-  fsb->f_type   = 0;
-  fsb->f_bsize  = fsd.du_bsize;
-  fsb->f_blocks = fsd.du_fsize - fsd.du_isize;
-  fsb->f_bfree  = fsd.du_tfree;
-  fsb->f_bavail = fsd.du_tfree;
-  fsb->f_files  = (fsd.du_isize - 2) * fsd.du_inopb;
-  fsb->f_ffree  = fsd.du_tinode;
-  fsb->f_fsid.val[0] = fsd.du_site;
-  fsb->f_fsid.val[1] = fsd.du_pckno;
-  return 0;
-}
-
-#endif /* _AIX && _I386 */

--- a/lib/getloadavg.c	Tue Oct 16 20:21:30 2018 +0200
+++ b/lib/getloadavg.c	Tue Oct 16 20:43:03 2018 +0200
@@ -883,7 +883,7 @@
 
 #   ifndef SUNOS_5
       if (
-#    if !(defined (_AIX) && !defined (ps2))
+#    if !defined (_AIX)
           nlist (KERNEL_FILE, name_list)
 #    else  /* _AIX */
           knlist (name_list, 1, sizeof (name_list[0]))

--- a/lib/stat-size.h	Tue Oct 16 20:21:30 2018 +0200
+++ b/lib/stat-size.h	Tue Oct 16 20:43:03 2018 +0200
@@ -79,15 +79,10 @@
      This loses when mixing HP-UX and BSD file systems with NFS.  */
 #  define ST_NBLOCKSIZE 1024
 # else /* !hpux */
-#  if defined _AIX && defined _I386
-    /* AIX PS/2 counts st_blocks in 4K units.  */
-#   define ST_NBLOCKSIZE (4 * 1024)
-#  else
-#   if defined _CRAY
-#    define ST_NBLOCKS(statbuf) \
+#  if defined _CRAY
+#   define ST_NBLOCKS(statbuf) \
   (S_ISREG ((statbuf).st_mode) || S_ISDIR ((statbuf).st_mode) \
    ? (statbuf).st_blocks * ST_BLKSIZE (statbuf) / ST_NBLOCKSIZE : 0)
-#   endif
 #  endif
 # endif
 #endif

--- a/m4/fsusage.m4	Tue Oct 16 20:21:30 2018 +0200
+++ b/m4/fsusage.m4	Tue Oct 16 20:43:03 2018 +0200
@@ -199,7 +199,7 @@
       ac_fsusage_space=yes
       AC_DEFINE([STAT_STATFS2_BSIZE], [1],
         [Define if statfs takes 2 args and struct statfs has a field named f_bsize.
-         (4.3BSD, SunOS 4, HP-UX, AIX PS/2)])
+         (4.3BSD, SunOS 4, HP-UX)])
     fi
   fi
 
@@ -337,6 +337,6 @@
 # Prerequisites of lib/fsusage.c not done by gl_FILE_SYSTEM_USAGE.
 AC_DEFUN([gl_PREREQ_FSUSAGE_EXTRA],
 [
-  AC_CHECK_HEADERS([dustat.h sys/fs/s5param.h sys/statfs.h])
+  AC_CHECK_HEADERS([sys/fs/s5param.h sys/statfs.h])
   gl_STATFS_TRUNCATES
 ])