Fix up compiler warnings and other issues when building on IRIX.

Merge of master-melb:xfs-cmds:24375a by kenmcd.

diff --git a/include/input.h b/include/input.h
index 20d2077f40743a931803e4d60de3598545394b6f..b2279835ca580ae8a403d285e3567e3a777d3181 100644 (file)
--- a/include/input.h
+++ b/include/input.h
@@ -38,7 +38,7 @@ extern double tdiv(double value, struct timeval tv);
 enum {
        DEFAULT_TIME            = 0x0,
        TERSE_FIXED_TIME        = 0x1,
-       VERBOSE_FIXED_TIME      = 0x2,
+       VERBOSE_FIXED_TIME      = 0x2
 };
 
 extern void    timestr(struct timeval *tv, char *str, size_t sz, int flags);

diff --git a/include/irix.h b/include/irix.h
index 0c80bec2e970e61da09a14127f53fc85942ccc3a..ca93457137d41cc2fdfbb621dbeeda066510137b 100644 (file)
--- a/include/irix.h
+++ b/include/irix.h
@@ -129,6 +129,7 @@ typedef struct xfs_fsop_attrmulti_handlereq {
 #ifndef __GNUC__
 #define __sgi__                __sgi
 #define __inline__     __inline
+#define inline         __inline
 #endif
 
 #define constpp                char * const *

diff --git a/include/path.h b/include/path.h
index 576842da828b439119447389e6bed97ee714eb44..6bf7338f0aa7314edb80ecfd9348ffe522a91e57 100644 (file)
--- a/include/path.h
+++ b/include/path.h
@@ -18,7 +18,7 @@
 #ifndef __PATH_H__
 #define __PATH_H__
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 
 /*
  * XFS Filesystem Paths

diff --git a/io/attr.c b/io/attr.c
index 83784aba1adb34809a2cd0b1f39a185deaa66512..c59b3d928a6ad30522bcfcc2e18d9d54387f8df8 100644 (file)
--- a/io/attr.c
+++ b/io/attr.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include <xfs/input.h>
 #include "init.h"

diff --git a/io/bmap.c b/io/bmap.c
index 7fe840b6ab36e257cf66718df50a1844b79790f0..a364759cd0a911391f95164a52390b3a7620d3dd 100644 (file)
--- a/io/bmap.c
+++ b/io/bmap.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include "init.h"
 #include "io.h"

diff --git a/io/fadvise.c b/io/fadvise.c
index 61724b5ce246781aea06ed3897fb95bed5e0aad1..b5ab65227d58900253aaef188464a09d131185cb 100644 (file)
--- a/io/fadvise.c
+++ b/io/fadvise.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include <xfs/input.h>
 #include "init.h"

diff --git a/io/file.c b/io/file.c
index 958cebda315b1e7b893a500e7a1c1268fa78a8a3..55bf31ae4f6fa909a1e4955fe04328e92f97c1da 100644 (file)
--- a/io/file.c
+++ b/io/file.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include <xfs/input.h>
 #include <sys/mman.h>

diff --git a/io/freeze.c b/io/freeze.c
index 0c8b1331b59ffb0953682b8fe7e1fafcc319d1f2..334b0cf7f75b6cfad08f621f355e7795a9f133f0 100644 (file)
--- a/io/freeze.c
+++ b/io/freeze.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include <xfs/input.h>
 #include "init.h"

diff --git a/io/fsync.c b/io/fsync.c
index 1f23949668d208726de0bbe432f7d858d589468b..83fc0f4378a94290d34fbe831af321690d162e32 100644 (file)
--- a/io/fsync.c
+++ b/io/fsync.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include "init.h"
 #include "io.h"

diff --git a/io/getrusage.c b/io/getrusage.c
index 40599211e29833262efcedbfea06a377d01f8d5f..ba35c5d559dbff521e397b800cda2998a36ad9c0 100644 (file)
--- a/io/getrusage.c
+++ b/io/getrusage.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include <xfs/input.h>
 #include <sys/time.h>

diff --git a/io/imap.c b/io/imap.c
index 3c35722b3f79df94605ccc988aa575cd53c11aef..73f37d00b163bc5d68cb874dee01f266a8437591 100644 (file)
--- a/io/imap.c
+++ b/io/imap.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include <xfs/input.h>
 #include "init.h"

diff --git a/io/init.c b/io/init.c
index a07f2fa1e0d2d75f68e2144a5c37acec01f8e00f..33361b9336529d9a2360172c6c0cb3bb14d65047 100644 (file)
--- a/io/init.c
+++ b/io/init.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include <xfs/input.h>
 #include "init.h"

diff --git a/io/inject.c b/io/inject.c
index c9244398de0e0460b408a2790aa22838cbb765a7..4be9d06a0fa1f3da58dc864cf0b6a95fb6d6faa4 100644 (file)
--- a/io/inject.c
+++ b/io/inject.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include <xfs/input.h>
 #include "init.h"

diff --git a/io/madvise.c b/io/madvise.c
index 618794affbccaaaa3f96f78de162b293909d0330..694cd415c3bf4faadc06415d027a5d4ae7ce276d 100644 (file)
--- a/io/madvise.c
+++ b/io/madvise.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include <xfs/input.h>
 #include <sys/mman.h>

diff --git a/io/mincore.c b/io/mincore.c
index f8028700be6dda8ecd527674a32ac5f487c336d1..f863f8480878bac2037b5d072988ca62ac2741b4 100644 (file)
--- a/io/mincore.c
+++ b/io/mincore.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include <xfs/input.h>
 #include <sys/mman.h>

diff --git a/io/mmap.c b/io/mmap.c
index 6af48d93384ed8f0bcaadfc1c6c6405ba4669dbd..faace11c605bd65988e5cb6388cf5ee920c35c5e 100644 (file)
--- a/io/mmap.c
+++ b/io/mmap.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include <xfs/input.h>
 #include <sys/mman.h>

diff --git a/io/open.c b/io/open.c
index 08425ebd432b105096bc76e219b05ee93748fb9f..1361e66101d1e4956cfa44dfd3aa6d9aa975a424 100644 (file)
--- a/io/open.c
+++ b/io/open.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include <xfs/input.h>
 #include "init.h"
@@ -380,7 +380,7 @@ lsproj_callback(
                        progname, path, strerror(errno));
        } else {
                if (getprojid(path, fd, &projid) == 0)
-                       printf("[%u] %s\n", projid, path);
+                       printf("[%u] %s\n", (unsigned int)projid, path);
                close(fd);
        }
        return 0;
@@ -418,7 +418,7 @@ lsproj_f(
        else if (getprojid(file->name, file->fd, &projid) < 0)
                perror("getprojid");
        else
-               printf(_("projid = %u\n"), projid);
+               printf(_("projid = %u\n"), (unsigned int)projid);
        return 0;
 }
 

diff --git a/io/pread.c b/io/pread.c
index 8c49560514d170cd24979b91e4b66a44950f3e9e..8816b36576d88fd537f9e2664b9b5ed9aa44375f 100644 (file)
--- a/io/pread.c
+++ b/io/pread.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include <xfs/input.h>
 #include <ctype.h>

diff --git a/io/prealloc.c b/io/prealloc.c
index e96c11286da35a246bce9c4dfda880308f9cc5e7..6a2563e8b60b38f43a48a8fd2b7a315e7c4ae32b 100644 (file)
--- a/io/prealloc.c
+++ b/io/prealloc.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include <xfs/input.h>
 #include "init.h"

diff --git a/io/pwrite.c b/io/pwrite.c
index 5f6fa1302b1e2f5559ae8bfc310bf203858dc193..90c36208397faaf8df8f538898c768f73ac1a827 100644 (file)
--- a/io/pwrite.c
+++ b/io/pwrite.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include <xfs/input.h>
 #include "init.h"

diff --git a/io/resblks.c b/io/resblks.c
index 67847799d75363fcdfdcfa3b52c12099cf295fb6..face1755becf02e2fd789bc61e012656079383c0 100644 (file)
--- a/io/resblks.c
+++ b/io/resblks.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include <xfs/input.h>
 #include "init.h"

diff --git a/io/sendfile.c b/io/sendfile.c
index 342eed36eb79e8f27e9c7b6ec13a786aa86948b8..a36f8bb748e4411496743064468323fa025877a2 100644 (file)
--- a/io/sendfile.c
+++ b/io/sendfile.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include <xfs/input.h>
 #include <sys/sendfile.h>

diff --git a/io/shutdown.c b/io/shutdown.c
index 700223549a03fb60684a0be8af5cee887a387fea..cf306fb88266410a9fa740ec20c6df1cdd5a9581 100644 (file)
--- a/io/shutdown.c
+++ b/io/shutdown.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include <xfs/input.h>
 #include "init.h"

diff --git a/io/truncate.c b/io/truncate.c
index d40001e12689632cfd0eb0f44d5420c15c21ec22..e7638da3fdee1506850f87ce8816d5e21285721b 100644 (file)
--- a/io/truncate.c
+++ b/io/truncate.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include <xfs/input.h>
 #include "init.h"

diff --git a/libhandle/handle.c b/libhandle/handle.c
index 935dcb65318aecf47e979eba73e54d7adf820970..dbd40f18280d54b5d182f8e444cc2ea4dd0b70bc 100644 (file)
--- a/libhandle/handle.c
+++ b/libhandle/handle.c
@@ -16,11 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
-
-/* attributes.h (purposefully) unavailable to xfsprogs, make do */
-struct attrlist_cursor { __u32 opaque[4]; };
-
+#include <xfs/xfs.h>
 #include <xfs/handle.h>
 
 /* just pick a value we know is more than big enough */

diff --git a/libhandle/jdm.c b/libhandle/jdm.c
index e3ca789f74bb574df6c74677434b585f298611e2..ae94ed3d7c211d66e0ad910d4ea73dfe2821fa73 100644 (file)
--- a/libhandle/jdm.c
+++ b/libhandle/jdm.c
@@ -16,11 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
-
-/* attributes.h (purposefully) unavailable to xfsprogs, make do */
-struct attrlist_cursor { __u32 opaque[4]; };
-
+#include <xfs/xfs.h>
 #include <xfs/handle.h>
 #include <xfs/jdm.h>
 

diff --git a/libxcmd/command.c b/libxcmd/command.c
index 21b5c43336833537fffe522fbfcd208e1154f7e7..dfde33b9e45c8260ceb4cd4a41da3625d6143723 100644 (file)
--- a/libxcmd/command.c
+++ b/libxcmd/command.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 #include <xfs/input.h>
 

diff --git a/libxcmd/help.c b/libxcmd/help.c
index 4e0c005638ef605f95968a461c14b6a369aad46b..c7a71b7846029fe3f7b344921031202ac5c863e4 100644 (file)
--- a/libxcmd/help.c
+++ b/libxcmd/help.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 
 static cmdinfo_t help_cmd;

diff --git a/libxcmd/input.c b/libxcmd/input.c
index cc782bcb20b97faa0154b5f0a5bd8439d3d20511..5814e221201cdedfab46704d4d484f40ef30958b 100644 (file)
--- a/libxcmd/input.c
+++ b/libxcmd/input.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/input.h>
 
 #if defined(ENABLE_READLINE)
@@ -26,6 +26,8 @@
 # include <histedit.h>
 #endif
 
+extern char *progname;
+
 static char *
 get_prompt(void)
 {
@@ -329,7 +331,7 @@ prid_from_string(
        prid_t          prid;
        char            *sp;
 
-       prid = strtoul(project, &sp, 10);
+       prid = (prid_t)strtoul(project, &sp, 10);
        if (sp != project)
                return prid;
        prj = getprnam(project);
@@ -346,7 +348,7 @@ uid_from_string(
        uid_t           uid;
        char            *sp;
 
-       uid = strtoul(user, &sp, 10);
+       uid = (uid_t)strtoul(user, &sp, 10);
        if (sp != user)
                return uid;
        pwd = getpwnam(user);
@@ -363,7 +365,7 @@ gid_from_string(
        gid_t           gid;
        char            *sp;
 
-       gid = strtoul(group, &sp, 10);
+       gid = (gid_t)strtoul(group, &sp, 10);
        if (sp != group)
                return gid;
        grp = getgrnam(group);

diff --git a/libxcmd/paths.c b/libxcmd/paths.c
index b37a2ac915de09e462bf64b56d189e4851fbd7d6..1a0a2177163610548330701dca639573c45b202a 100644 (file)
--- a/libxcmd/paths.c
+++ b/libxcmd/paths.c
@@ -28,6 +28,8 @@
 #include <xfs/input.h>
 #include <xfs/project.h>
 
+extern char *progname;
+
 int fs_count;
 struct fs_path *fs_table;
 struct fs_path *fs_path;
@@ -136,9 +138,7 @@ fs_extract_mount_options(
        char            **logp,
        char            **rtp)
 {
-       char            *fslog, *fsrt, *fslogend, *fsrtend;
-
-       fslog = fsrt = fslogend = fsrtend = NULL;
+       char            *fslog, *fsrt;
 
        /* Extract log device and realtime device from mount options */
        if ((fslog = hasmntopt(mnt, "logdev=")))
@@ -148,11 +148,11 @@ fs_extract_mount_options(
 
        /* Do this only after we've finished processing mount options */
        if (fslog) {
-               fslogend = strtok(fslog, " ,");
+               strtok(fslog, " ,");
                fslog = strdup(fslog);
        }
        if (fsrt) {
-               fsrtend = strtok(fsrt, " ,");
+               strtok(fsrt, " ,");
                fsrt = strdup(fsrt);
        }
 

diff --git a/libxcmd/projects.c b/libxcmd/projects.c
index f593cd89bb5b82c9f895e991693f62f376ef45fa..9ea4a7fc083632ae28f2ec2126849dc200da8ac2 100644 (file)
--- a/libxcmd/projects.c
+++ b/libxcmd/projects.c
@@ -81,7 +81,7 @@ getprent(void)
 
        if (!projects)
                return NULL;
-       do {
+       for (;;) {
                if (!fgets(projects_buffer, size, projects))
                        break;
                /*
@@ -101,7 +101,7 @@ getprent(void)
                p.pr_prid = atoi(idstart+1);
                p.pr_name = &projects_buffer[0];
                return &p;
-       } while (1);
+       }
 
        return NULL;
 }
@@ -142,7 +142,7 @@ getprpathent(void)
 
        if (!project_paths)
                return NULL;
-       do {
+       for (;;) {
                if (!fgets(project_paths_buffer, size, project_paths))
                        break;
                /*
@@ -162,7 +162,7 @@ getprpathent(void)
                pp.pp_pathname = nmstart + 1;
                pp.pp_prid = atoi(&project_paths_buffer[0]);
                return &pp;
-       } while (1);
+       }
 
        return NULL;
 }

diff --git a/libxcmd/quit.c b/libxcmd/quit.c
index 590e74172ea827b0138cea6cf2ee690d95f2054d..89498455a40bfb78a7bea8e7ed202b8e346a2feb 100644 (file)
--- a/libxcmd/quit.c
+++ b/libxcmd/quit.c
@@ -16,11 +16,12 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/command.h>
 
 static cmdinfo_t quit_cmd;
 
+/* ARGSUSED */
 static int
 quit_f(
        int     argc,

diff --git a/man/man8/xfs_io.8 b/man/man8/xfs_io.8
index c7a95a63988913213ff34b40945c4feae2d26555..673c65bcbd1e92d48aaa147bc91e2212eb6247da 100644 (file)
--- a/man/man8/xfs_io.8
+++ b/man/man8/xfs_io.8
@@ -6,7 +6,7 @@ xfs_io \- debug the I/O path of an XFS filesystem
 \f3xfs_io\f1 [ \f3\-c\f1 cmd ] ... [ \f3\-p\f1 prog ] [ \f3\-adFfmrRstx\f1 ] file
 .fi
 .SH DESCRIPTION
-\f2xfs_io\f1 is a debugging tool like \f2xfs_db\f1(8), but is aimed
+\f2xfs_io\f1 is a debugging tool like \f2xfs_db\f1, but is aimed
 at examining the regular file I/O path rather than the raw XFS volume
 itself.
 .PP
@@ -135,15 +135,15 @@ See the \f3pwrite\f1 command.
 .TP
 \f3bmap\f1 [ \f2\-adlpv\f1 ] [ \f2\-n nx\f1 ]
 Prints the block mapping for the current open file.
-Refer to \f2xfs_bmap\f1(8) for complete documentation.
+Refer to the \f2xfs_bmap\f1 manual page for complete documentation.
 .TP
 \f3allocsp\f1 \f2offset\f1 \f2length\f1
 Allocates zeroed space for part of a file using the XFS_IOC_ALLOCSP
-system call described in \f2xfs\f1(5).
+system call described in the \f2xfs\f1 manual page.
 .TP
 \f3freesp\f1 \f2offset\f1 \f2length\f1
 Frees space for part of a file using the XFS_IOC_FREESP
-system call described in \f2xfs\f1(5).
+system call described in the \f2xfs\f1 manual page.
 .TP
 \f3fadvise\f1 [ \f2\-dnrsw\f1 ]
 On platforms which support it, allows hints be given to the system
@@ -162,11 +162,11 @@ See the \f3fsync\f1 command.
 .TP
 \f3resvsp\f1 \f2offset\f1 \f2length\f1
 Allocates reserved, unwritten space for part of a file using the XFS_IOC_RESVSP
-system call described in \f2xfs\f1(5).
+system call described in the \f2xfs\f1 manual page.
 .TP
 \f3unresvsp\f1 \f2offset\f1 \f2length\f1
 Frees reserved space for part of a file using the XFS_IOC_UNRESVSP
-system call described in \f2xfs\f1(5).
+system call described in the \f2xfs\f1 manual page.
 .TP
 \f3truncate\f1 \f2offset\f1
 Truncates the current file at the given offset using \f2ftruncate\f1(2).
@@ -292,8 +292,7 @@ Only available in expert mode and requires privileges.
 .TP
 \f3resblks\f1 [ \f2blocks\f1 ]
 Get and/or set count of reserved filesystem blocks using the
-XFS_IOC_GET_RESBLKS or XFS_IOC_SET_RESBLKS system calls,
-as described in \f2xfs\f1(5).
+XFS_IOC_GET_RESBLKS or XFS_IOC_SET_RESBLKS system calls.
 Note \-\- this can be useful for exercising out of space behavior.
 Only available in expert mode and requires privileges.
 .TP
@@ -303,14 +302,27 @@ Only available in expert mode and requires privileges.
 .TP
 \f3stat\f1 [ \f2\-v\f1 ]
 Selected statistics from \f2stat\f1(2) and the XFS_IOC_GETXATTR
-system call from \f2xfs\f1(5) on the current file.
+system call on the current file.
 If the \f2-v\f1 option is specified, the atime (last access), mtime
 (last modify), and ctime (last change) timestamps are also displayed.
 .TP
 \f3statfs\f1
 Selected statistics from \f2statfs\f1(2) and the XFS_IOC_FSGEOMETRY
-system call from \f2xfs\f1(5) on the filesystem where the current
-file resides.
+system call on the filesystem where the current file resides.
+
+.SH IRIX SEE ALSO
+mkfs_xfs(1M),
+syssgi(2),
+xfs_bmap(1M),
+xfs_db(1M),
+xfs(4).
+
+.SH LINUX SEE ALSO
+mkfs.xfs(8),
+xfsctl(3),
+xfs_bmap(8),
+xfs_db(8),
+xfs(5).
 
 .SH SEE ALSO
 fdatasync(2),
@@ -318,11 +330,7 @@ fstat(2),
 fstatfs(2),
 fsync(2),
 ftruncate(2),
-mkfs.xfs(8),
 mmap(2),
 open(2),
 pread(2),
-pwrite(2),
-xfs_bmap(8),
-xfs_db(8),
-xfs(5).
+pwrite(2).

diff --git a/man/man8/xfs_quota.8 b/man/man8/xfs_quota.8
index d596507bae9e43798349d924a3221274829c2eaf..34212069c560889aac71e37441b8aa69c03b4033 100644 (file)
--- a/man/man8/xfs_quota.8
+++ b/man/man8/xfs_quota.8
@@ -165,8 +165,9 @@ guarantee of consistency.
 As such, it is administered differently, in particular:
 .TP
 1.
-.BR quotacheck (8)
-has no effect on XFS filesystems.
+The
+.B quotacheck
+command has no effect on XFS filesystems.
 The first time quota accounting is turned on (at mount time), XFS does
 an automatic quotacheck internally; afterwards, the quota system will
 always be completely consistent until quotas are manually turned off.
@@ -181,7 +182,7 @@ filesystem.
 However, it is possible to turn on/off limit enforcement any time
 quota accounting is turned on.
 The "quota" option to the
-.BR mount (8)
+.B mount
 command turns on both (user) quota accounting and enforcement.
 The "uqnoenforce" option must be used to turn on user accounting with
 limit enforcement disabled.
@@ -190,7 +191,7 @@ limit enforcement disabled.
 Turning on quotas on the root filesystem is slightly different from
 the above.
 For IRIX XFS, refer to
-.BR quotaon (1)
+.BR quotaon (1M).
 For Linux XFS, the quota mount flags must be passed in with the
 "rootflags=" boot parameter.
 .TP
@@ -201,7 +202,7 @@ and also to monitor the space occupied by the quota system itself..
 .TP
 6.
 There is a mechanism built into
-.BR xfsdump (8)
+.B xfsdump
 that allows quota limit information to be backed up for later
 restoration, should the need arise.
 .TP
@@ -452,8 +453,15 @@ Mapping of numeric project identifiers to directories trees.
 .BR /etc/projid
 Mapping of numeric project identifiers to project names.
 .PD
+.SH IRIX SEE ALSO
+quotaon(1M),
+xfs(4).
+
+.SH LINUX SEE ALSO
+warnquota(8),
+xfs(5).
+
 .SH SEE ALSO
 df(1),
 mount(1),
 sync(2),
-xfs(5).

diff --git a/quota/project.c b/quota/project.c
index 714ec7d8dfa2b860806f572e3107eb20be5dc018..6eae4dff2a194839a92bc4897a8a75c22fa1dd1f 100644 (file)
--- a/quota/project.c
+++ b/quota/project.c
@@ -93,7 +93,7 @@ check_project(
                if (fsx.fsx_projid != prid)
                        printf(_("%s - project identifier is not set"
                                 " (inode=%u, tree=%u)\n"),
-                               path, fsx.fsx_projid, prid);
+                               path, fsx.fsx_projid, (unsigned int)prid);
                if (!(fsx.fsx_xflags & XFS_XFLAG_PROJINHERIT))
                        printf(_("%s - project inheritance flag is not set\n"),
                                path);

diff --git a/quota/quota.c b/quota/quota.c
index 469c51fe93807a6c774a3fb3e89c3c9b7a9ff929..e0c7a75a0021fecf508bbba51e487636ce5c7d15 100644 (file)
--- a/quota/quota.c
+++ b/quota/quota.c
@@ -314,7 +314,7 @@ getprojectname(
 
        if ((p = getprprid(prid)))
                return p->pr_name;
-       snprintf(buffer, sizeof(buffer), "#%u", prid);
+       snprintf(buffer, sizeof(buffer), "#%u", (unsigned int)prid);
        return &buffer[0];
 }
 

diff --git a/quota/report.c b/quota/report.c
index 7adde82beedd5363769f17d4ba0a08c1cfe8d41e..0d6d8d0b36523a27097bfe44e308665181c2d629 100644 (file)
--- a/quota/report.c
+++ b/quota/report.c
@@ -478,7 +478,8 @@ report_project_mount(
                setprent();
                while ((p = getprent()) != NULL) {
                        if (flags & NO_LOOKUP_FLAG)
-                               snprintf(n, sizeof(n)-1, "#%u", p->pr_prid);
+                               snprintf(n, sizeof(n)-1, "#%u",
+                                        (unsigned int)p->pr_prid);
                        else
                                strncpy(n, p->pr_name, sizeof(n)-1);
                        if (report_mount(fp, p->pr_prid, n,

diff --git a/quota/util.c b/quota/util.c
index acea6ead948da6532101fe981d6cc53bcde6033e..6499c3ef7d365848a26252d356f26dce2e3e5fed 100644 (file)
--- a/quota/util.c
+++ b/quota/util.c
@@ -20,6 +20,7 @@
 #include <pwd.h>
 #include <grp.h>
 #include <utmp.h>
+#include "init.h"
 #include "quota.h"
 
 #define SECONDS_IN_A_DAY       (24 * 60 * 60)